Merge branch 'master' of github.com:johanmattssonm/birdfont

Merge branch '2.x' of github.com:johanmattssonm/birdfont into 2.x

Merge branch '2.x' of github.com:johanmattssonm/birdfont into 2.x

Merge ../birdfont-2.x

Fixed image rotation and add on axis to the button description

Speed optimization for rotation of raster images

More raster image optimizations

Speed optimization for rotated background images

White space fixes

Merge branch 'master' of gitorious.org:birdfont/birdfont

Conflicts:
	libbirdfont/BirdFontFile.vala

Settings tab

Compile with libgit2

Fix image rotation

New file chooser & keep expanders open

Resize background image around its center.

Center new images

Rename GlyphBackgroundImage to BackgroundImage

Import png images in a background thread

Visual improvement of crop tool

android port of libbirdfont

fix warnings in export

new build script on linux

move test cases

Merge branch 'master' of gitorious.org:birdfont/birdfont

mac issues, including a more permissive license for libbirdfont