Remake to annotation-driven.
Remake to annotation-driven. 2
Merge origin/master

Conflicts:
	CaloryCounter-Web/src/main/webapp/layout.jsp