Merge remote-tracking branch 'origin' into reform_canvas

Conflicts:
	public/javascripts/oddsSystem/client.js
	public/javascripts/oddsSystem/ugly.min.js
	public/javascripts/qrCodeReader/ugly.min.js
	views/oddsSystem.jade