Merge branch 'master' of https://github.com/kvanrobbroeck/nutrition
d from commit e9e198342430d9fd96aedc40db276c1c625663e9)

Conflicts:
	.idea/.name
	.idea/compiler.xml
	.idea/misc.xml
	.idea/vcs.xml

Conflicts:
	.idea/.name
	.idea/compiler.xml
	.idea/misc.xml
	.idea/vcs.xml
Merge branch 'master' of https://github.com/kvanrobbroeck/nutrition