User and UserDao
.ds_store
add id to User
Jersey Service
maven service first commit
syntax error
test git pull and fetch
test git pull
delete useless files
Merge branch 'YBranch' into beta

Conflicts:
	.DS_Store
	Eatopian/.classpath
	Eatopian/src/com/eatopian/entity/Restaurant.java
Merge branch 'beta' of https://github.com/geniewang/eatopian-server into beta