working on it (3)
Merge branch 'master' of https://github.com/RomanYemelyanenko/VKMusic

Conflicts:
	VKMusicProject/VKMusic/src/main/res/layout/layout_login.xml