first commit , test git
office
office
office
OFFICE
office
office
office
office
office
office
Merge remote-tracking branch 'origin/master'

Conflicts:
	LifeManager/AndroidManifest.xml
	LifeManager/res/values/strings.xml