genaral js
Merge branch 'sentry-and-ajax-merge' of https://github.com/Evercise/evercise into sentry-and-ajax-merge

Conflicts:
	app/assets/javascripts/general.js