Bulk charges and active users
Update deleted items
Merge branch 'master' of https://github.com/OCAlpha/website

Conflicts:
	app/views/charges/_form.html.erb