javascript "fix"
Merge branch 'master' of https://github.com/khcr/resj

Conflicts:
	app/views/orators/show.html.erb