DEC. 15, 14pm
20pm, 15 Dec
20pm, 15 Dec
Merge branch 'guocheng' of https://github.com/NeutronStarCO/Neutron.git into guocheng
12:00pm, 20th Dec
Merge branch 'master' of https://github.com/NeutronStarCO/Neutron.git

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
Merge branch 'master' into ztong
家庭-添加模块功能完善