changes
Add null check
Correct imports

Never ever use the edit button on GitHub. Ever.
Merge pull request #1060 from niyaro/fixasync

Bug-fix: AssetManager loads ETC1 textures synchronously
fix natives for LwjglHeadlessApplication
new Application type HeadlessDesktop for LwjglHeadlessApplication
Merge remote-tracking branch 'origin/master' into experimental-changes
Experimental: Update changes for wakelock changes
Merge pull request #1079 from Unkn0wn0ne/experimental-changes

Removed deprecated wakelock dependence from Android backend
Merge remote-tracking branch 'origin/master' into skin-fontsize

Conflicts:
	CHANGES
	gdx/src/com/badlogic/gdx/scenes/scene2d/ui/Skin.java
Rename 'size' JSON attribute (of BitmapFont) to 'scaledSize'
Merge pull request #1033 from veger/skin-fontsize

Support 'size' as a json skin data value for BitmapFont
Fixed atlas index
Index is always (gid-1), so the processing order of the tile sets does not matter.
x taking Vector2.
Merge branch 'origin/master'
Changed scaledSize to be desired cap height rather than line height.

#1033
Cleanup: Removed unused imports in AndroidNet
Merge pull request #1089 from Unkn0wn0ne/experimental-changes

Removed unused imports in AndroidNet
Pretty print settings. has method.
Merge branch 'origin/master'