Merge branch 'GBranch' into beta
Han's changes
add UserDao
changes
rename MyUserService
User service return xml type
produces application/xml
login and register
change id to Integer
add GFS test
new
change id type from long to Integer
Merge branch 'beta' of https://github.com/geniewang/eatopian-server into beta

Conflicts:
	Service/src/main/java/com/eatopian/dao/RestaurantUserDao.java
correct application context xml
Merge branch 'beta' of https://github.com/geniewang/eatopian-server into beta

Conflicts:
	Service/src/main/java/com/eatopian/dao/RestaurantUserDao.java
no error
add spring to pom
new
convert jersey to spring
haha