added more layouts
Merge branch 'master' of https://github.com/xeroiv/Proliphix-Android-App

Conflicts:
	res/layout/main.xml
	res/layout/profile_settings.xml