Phi first commit
Merge remote-tracking branch 'origin/P_develop_login' into develop_login

Conflicts:
	README.md