Merge branch 'master' of https://github.com/kmruiz/KampGameBase

Conflicts:
	GameBase/src/main/AndroidManifest.xml
	gradle/wrapper/gradle-wrapper.properties
Merge branch 'master' of https://github.com/kmruiz/KampGameBase

Conflicts:
	GameBase/src/main/java/net/kamp/android/gaming/game/activities/start/UserActivity.java
Merge remote-tracking branch 'origin/master'