Api changed but not 100%
Merge branch 'master' of https://github.com/rubinoske/Comfort-Food

Conflicts:
	website/classes/Config.php