Merge branch 'rhmtts-master'

Conflicts:
	.gitignore
	AndroidManifest.xml
	src/android/gameengine/icadroids/input/MotionSensor.java
	src/com/android/vissenspel/Vis.java
Merge branch 'master' of https://github.com/ddoa/game-api-android