Flat login added
Merge branch 'master' of https://github.com/gweodoo/mpp_project

Conflicts:
	Mpp_Project/res/values/strings.xml