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

Conflicts:
	api/restapi.php
	assets/js/Application.js

bulk/compile/99f66c1ab9afe323b6f19d199a2812f43bf0a611.file.gallery50s.tp
l.php
	logs/allerrors.log