Merge branch 'master' of
https://github.com/androidzhaoxiaogang/productmanagement.git

Conflicts:
	res/layout/activity_main.xml
	res/values/strings.xml
Merge branch 'master' of
https://github.com/androidzhaoxiaogang/productmanagement.git