update class and Dao
Merge branch 'master' of https://github.com/meet-for-meal/meetformeal

Conflicts:
	meetmeal/WEB-INF/src/org/essilab/module/user/model/User.java
	meetmeal/WEB-INF/src/org/essilab/module/user/model/UserDao.java
Merge branch 'master' of https://github.com/meet-for-meal/meetformeal