Magic
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/desktop/js/controller.js