Current state1
Merge remote-tracking branch 'origin/master'

Conflicts:
	geoMMO_android/src/com/example/geommo/LogInActivity.java