Campaign
Merge branch 'dev' of https://github.com/si4dev/storeplay into dev

Conflicts:
	lib/Model/Media.php
	templates/default/list/campaign.html