Another attempt
Merge branch 'master' of github.com:ffortin/i18n-js-woes

Conflicts:
	lib/i18n/js/sprockets_preprocessor.rb