switching to gradle is a pain in my
Merge branch 'master' of https://github.com/jakedarling/gradle-test

Conflicts:
	android/assets/fliers/fliers.png
	android/assets/fliers/retro.png
	android/assets/inGame/inGameAtlas.pack
	android/assets/inGame/inGameAtlas2.png
	android/res/values/strings.xml
	build.gradle
	core/src/com/magicflight/jakedean/Assets.java
	core/src/com/magicflight/jakedean/ButtonsChooseFlierMenu.java
	core/src/com/magicflight/jakedean/ButtonsInGame.java
	core/src/com/magicflight/jakedean/Flier.java
	core/src/com/magicflight/jakedean/FlierNormal.java
	core/src/com/magicflight/jakedean/GameRenderer.java
	core/src/com/magicflight/jakedean/GameScreen.java
	core/src/com/magicflight/jakedean/GameWorld.java
	core/src/com/magicflight/jakedean/HighScoreScreen.java
	core/src/com/magicflight/jakedean/MainMenuScreen.java
	html/webapp/index.html
	settings.gradle