Base for front-end.
Merge origin/master

Conflicts:
	CaloryCounter-Frontend/pom.xml