fix typo
merge branch 'ui' of https://github.com/Determinant/piztor into ui

Conflicts:
	piztor_ui/res/layout/activity_login.xml