API
Merge branch 'master' of https://github.com/insins/MAIVFOOD

Conflicts:
	logs/allerrors.log