Merge remote-tracking branch 'origin/master'

Conflicts:
	views/desktop/static/partials/spec.html