mod: reform canvas
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
keep assistant mode
Merge pull request #2 from kuriko/reform_canvas

WIP: reform canvas