added bootstrap markup to about page
Merge branch 'bootstrap-templates' of https://github.com/codeforamerica/councilmatic into bootstrap-templates
Merge branch 'bootstrap-templates' of https://github.com/codeforamerica/councilmatic into bootstrap-templates
Merge branch 'bootstrap-templates' of https://github.com/codeforamerica/councilmatic into bootstrap-templates
dashboard markup, added glyphicons, moved bookmark_button to councilmatic partials folder
setting bookmark text back until bootstrap icons are fixed
added styles and markup to fix map and list items, using addthis for sharing
Merge branch 'bootstrap-templates' of git://github.com/open-city/councilmatic into open-city-bootstrap-templates

Conflicts:
	councilmatic/static/councilmatic/src/councilmatic.less