Merge branch 'YBranch' of https://github.com/geniewang/eatopian into YBranch
Genie version
Merge branch 'YBranch' into GBranch

Conflicts:
	Eatopian/.classpath
	Eatopian/src/com/eatopian/entity/User.java
	Eatopian/src/com/eatopian/service/UserService.java
Genie code