login
Merge remote-tracking branch 'GitHub/master'

Conflicts:
	CloudAlarmClock/res/layout/login.xml