Change layout for login & register
Merge remote-tracking branch 'origin/master'

Conflicts:
	geoMMO_android/AndroidManifest.xml
	geoMMO_android/project.properties
	geoMMO_android/src/com/geommo/MainActivity.java