bugfix: add attr_accessible for payer_show_intro in campaign model
bugfix: only merchant users can view/edit merchant pages
Merge branch 'master' of https://github.com/poktz/poktz