Fixed current function
Integrate question
Merge branch 'develop' of github.com:jplusplus/arte-world-of-work into develop

Conflicts:
	app/static/arte_ww/js/app.coffee