Merge branch 'release-0.5' into develop
changes to static html site
Updated news page for phase two launch
Merge branch 'develop' into hotfix-0.5.1

Conflicts:
	app/views/venues/index.html.erb