fix
Merge remote-tracking branch 'origin/production'

Conflicts:
	src/documents/scripts/script.js.coffee