Merge origin/master

Conflicts:
	app/View/Themed/Oncamp/Campaign/view.ctp
Merge origin/master

Conflicts:
	app/View/Themed/Oncamp/Campaign/view.ctp
Merge origin/master

Conflicts:
	app/View/Themed/Oncamp/Campaign/view.ctp