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

Conflicts:
	GameBase/src/main/java/net/kamp/android/gaming/game/activities/start/UserActivity.java
Merge branch 'master' of https://github.com/kmruiz/KampGameBase

Conflicts:
	GameBase/src/main/AndroidManifest.xml
	GameBase/src/main/res/layout/activity_story_touch.xml