Change login layout
Merge branch 'master' of https://github.com/cipele46/cipele46-android

Conflicts:
	res/values/strings.xml
Merge branch 'master' of https://github.com/cipele46/cipele46-android