clean
add id to User
Merge branch 'YBranch' of https://github.com/geniewang/eatopian into GBranch

Conflicts:
	Eatopian/src/com/eatopian/entity/User.java
Merge branch 'YBranch' into GBranch