Restart fixes
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	js/dashboard/script.js