添加个人资料
Merge branch 'master' of https://github.com/ITBox/BabySay

Conflicts:
	app/AndroidManifest.xml
	app/res/values/strings.xml
	app/src/cc/itbox/babysay/activities/BaseActivity.java