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

Conflicts:
	meetmeal/WEB-INF/src/org/essilab/module/announce/AnnounceService.java
	meetmeal/WEB-INF/src/org/essilab/module/announce/model/AnnounceDao.java