bef merge
Merge branch 'master' of https://github.com/Factor-X/citizens-reserve

Conflicts:
	public/javascripts/app.js
actions