Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/src/taskbar.js
	index.html