Fix stackoverflow exception, replace sql query with criteria
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/pages/calendar.jsp
Fix stackoverflow exception, replace sql query with criteria