test git push function
Merge branch 'master' of https://github.com/flowerOurs/flower.git

Conflicts:
	source/server/appService/src/com/huhuo/app/HomeController.java