bug #23722
bug #23721
bug #23719
bug #23718
bug #23717
bug #23716
bug #23715
bug #23714
bug #23706
bug #23618
bug #22861
bug #23381
bug #23491
Merge remote-tracking branch 'jeremy/master' into develop

Conflicts:
	app/assets/javascripts/vendor/main.js