Removes error on any click
Merge branch 'master' into jslint

Conflicts:
	app/assets/javascripts/views/static/static_index.js