hopefully this works
updated to a working version of WB
Merge remote-tracking branch 'origin/master' into grunt

Conflicts:
	frontend/canvas.js
	frontend/canvas.ls
	frontend/home.html