More UI Changes
Merge branch 'master' of https://github.com/omri/Streets

Conflicts:
	public/templates/story_page.html