Merge branch 'release-0.5' into develop
fix empty facebook events showing
changes to static html site
switch to oceania continental naming
Updated news page for phase two launch
Merge branch 'develop' into hotfix-0.5.1

Conflicts:
	app/views/venues/index.html.erb
Merge branch 'hotfix-0.5.1'