Fixed #250
Merge remote-tracking branch 'origin/qa' into qa

Conflicts:
	public/js/labels.js