design stuff
Merge branch 'master' of https://github.com/alexdzeshko/secure_photo

Conflicts:
	SP/src/main/res/menu/main_menu.xml