js fix
the changes didn't go through
typo
Merge branch 'master' into small-fixes

Conflicts:
	app/assets/javascripts/admin.js
Merge branch 'small-fixes'