Update
Merge branch 'master' of github.com:wlepinski/rabisco-chromeapp

Conflicts:
	app/scripts/directives/canvas.js