fix broken javascrtip
Merge branch 'master' into bugfix#18

Conflicts:
	assets/js/index.js