Test
Merge branch 'master' of https://github.com/matthiasdeckx/MAIV_FOOD

Conflicts:
	.gitignore
	src/js-dev/classes/Util.js
	src/js/main.js
Test
Test