Merge branch 'dev_screens' of https://github.com/fnipo/google_login into dev_screens

Conflicts:
	google_login/res/layout/activity_main.xml
	google_login/res/values/strings.xml
fix merge