Redid Login Screen

Looks pretty now.  Says Colin!
Merge branch 'imdragon-master'
Merge branch 'master' of https://github.com/matortheeternal/PartnersInEducation-EventApp

Conflicts:
	SBCCGroup/res/layout/activity_login.xml
	SBCCGroup/res/values/strings.xml