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

Conflicts:

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

bulk/compile/6e0fd51da328da0c8115217f2a9aa142f50496ca.file.detail50s.tpl
.php

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

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

bulk/compile/cbf964ad0f50ecdbba317fc5bb7190412b584b83.file.gallery80s.tp
l.php

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

bulk/compile/e308f22c598710e988181cd423d1886f7d3f4734.file.detail00s.tpl
.php

bulk/compile/f434b1eca2b045a3051c0be1bf033ec6469488fc.file.detail80s.tpl
.php