fix DARS17
Merge branch 'master' of github.com:asime/DARSWorkWorld

Conflicts:
	app/assets/javascripts/application.js