Sortable locastions, now <p> not button, no JS yet
Merge branch 'master' of https://github.com/chyld/civic-hacking

Conflicts:
	app/static/js/es6/maps.es6.js
	app/views/home/index.jade
	app/views/shared/template.jade
Merge branch 'master' of https://github.com/chyld/civic-hacking

Conflicts:
	app/less/app.less
	app/static/js/es6/maps.es6.js