Merge origin/master

Conflicts:
	web/scripts/tasks.js
Merge origin/master

Conflicts:
	web/scripts/tasks.js