Guven commit
Merge branch 'master' of https://github.com/peakgames/AwesomePingPong

Conflicts:
	android/target/classes.dex
	android/target/classes/net/peakgames/mobile/android/devfest/pong/BuildConfig.class
	android/target/classes/net/peakgames/mobile/android/devfest/pong/R$attr.class
	android/target/classes/net/peakgames/mobile/android/devfest/pong/R$drawable.class
	android/target/classes/net/peakgames/mobile/android/devfest/pong/R$string.class
	android/target/classes/net/peakgames/mobile/android/devfest/pong/R.class
	android/target/pongGame-android.ap_
	android/target/pongGame-android.apk
	android/target/pongGame-android.jar
	core/src/main/java/net/peakgames/mobile/android/devfest/pong/core/view/screens/GameScreen.java
	core/target/classes/net/peakgames/mobile/android/devfest/pong/core/view/screens/GameScreen$1.class
	core/target/classes/net/peakgames/mobile/android/devfest/pong/core/view/screens/GameScreen.class
	core/target/pongGame-core-1.0-SNAPSHOT-sources.jar
	core/target/pongGame-core-1.0-SNAPSHOT.jar
Menu problems
Merge branch 'master' of https://github.com/peakgames/AwesomePingPong