bulk
Merge branch 'master' of https://github.com/tychomartins/FOOD

Conflicts:

bulk/compile/1f60b181d356074d67921bb7c799bed71d2db354.file.index.htm.php

bulk/compile/6fc1e9c8124881d5de817766906311b5c7d4961f.file.campaign.tpl.
php

bulk/compile/8440fad56a6e193cbd984eebe94c35d3fb16dd17.file.create.tpl.ph
p

bulk/compile/ccb6298d2802003163a3ed70fd118ea09320492c.file.gallery.tpl.p
hp
	logs/allerrors.log
bulk