Merge branch 'master' of https://github.com/zjn0505/GitShare.git

Conflicts:
	res/layout/good_day.xml
Merge branch 'master' of https://github.com/zjn0505/GitShare.git