first try for main branch
Merge branch 'testbranch'

Conflicts:
	src/com/huhuo/app/HomeController.java
eclipse configuration file commit