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

Conflicts:
	.idea/workspace.xml

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

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

bulk/compile/99f66c1ab9afe323b6f19d199a2812f43bf0a611.file.gallery50s.tp
l.php

bulk/compile/ccb6298d2802003163a3ed70fd118ea09320492c.file.gallery.tpl.p
hp

bulk/compile/e73f98f04db3d94da10a23bd78d47db0ac2374b5.file.gallery00s.tp
l.php
'