Survey pages canvas
Merge branch 'master' of https://github.com/Factor-X/citizenReserve

Conflicts:
	public/javascripts/app.js