lecture
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/src/com/mygdx/game/android/AndroidLauncher.java
	core/src/com/mygdx/game/GoGame.java
	core/src/com/mygdx/game/MyGdxGame.java
de