some updates
try merge
Merge branch 'master' of https://github.com/wangyan4622/birthdayApp.git

Conflicts:
	res/layout/activity_main.xml