Removed hashtag from adress bar.
Added linking from main movie page to detail movie page
Merge remote-tracking branch 'github/master'

Conflicts:
	app/assets/javascripts/zope.js
	app/views/main/index.html.erb
	index.html