Merge branch 'master' of https://github.com/micdevcamp/benefund

Conflicts:
	app/lang/en/campaigns.php