derpswipes
Merge remote-tracking branch 'origin/master'

Conflicts:
	DinoTopHat/android/src/com/dinoth/game/android/AndroidLauncher.java