Corrected positioning
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/oles/rus/app/olesrusapp/LoginCom.java
	app/src/main/java/oles/rus/app/olesrusapp/MapsActivity.java
	app/src/main/res/values/strings.xml
Corrected positioning