Support 'size' as a json skin data value for BitmapFont
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
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'
Add default button that set the particle sprite to 'particle.png'
Use a constant for the default particle
Merge pull request #1100 from veger/particleeditor-1

Add default button that set the particle sprite to 'particle.png'