2-11

latest with images
Merge remote-tracking branch 'origin/AO_branch' into AO2

Conflicts:
	.DS_Store
	app/.DS_Store
	app/images/by-top-level-category/music.png

app/images/by-top-level-category/sub-category-1/community/businessnetwor
king.png

app/images/by-top-level-category/sub-category-1/community/classesworksho
ps.png

app/images/by-top-level-category/sub-category-1/community/familyfriendly
.png

app/images/by-top-level-category/sub-category-1/community/homeandgarden.
png
	app/index.html
	app/scripts/controllers/eventview.js
	app/scripts/services/datefixer.js
	app/styles/main.scss
	app/views/partials/eventview.html
	app/views/partials/venueview.html
	dist/index.html
	dist/views/partials/card-primary.html
	dist/views/partials/eventview.html
	dist/views/partials/hero.html
	dist/views/partials/venueview.html