Added redirection to main page, prevent routing error
Merge remote-tracking branch 'heroku/master'

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