Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Add a method for getting UIViewController.
Fixing bug where exception thrown by Mono is not caught in Java.
Requires a hack since Java compiler does not understand this.
Cleaning up comment
JsonWriter, fixed JSON format putting quotes around numbers and booleans.
Merge remote-tracking branch 'origin/master'
FileProcessor, copy constructor, change processDir to be called even if input files is empty (simplifies processing in many cases).
TexturePacker2, added combineSubdirectories setting.
Add managing child shapes for btCompoundShape
TexturePacker2, added flattenPaths setting.
Add btCollisionObject#dispose
Small changes
fixed superjumper-ios references
fixed gdx-invaders-ios references, need to create dummy controllers ios backend
Merge pull request #236 from xoppa/bullet

Bullet, Add managing child shapes for btCompoundShape
Merge pull request #235 from tamdinh/0c7dab7dc32d77de55e51311a68d59f8b66928f0

Add getUIViewController() in IOSApplication
fixed ios demo projects to use simpler convert.properties file
Merge branch 'master' of github.com:libgdx/libgdx
fixed source/target Java version in IKVM conversion script tempalte