test
status
test again
Merge branch 'master' of github.com:HolyJecht/GroupFood

Conflicts:
	src/main/java/com/dwbook/phonebook/dao/UserDAO.java
	src/main/java/com/dwbook/phonebook/representations/User.java
	src/main/java/com/dwbook/phonebook/resources/UserResource.java