lib
Merge branch 'develop' of github.com:maxiru/canvas-console into develop

Conflicts:
	lib/bar-publisher-assembly-1.0.jar
Merge branch 'develop' of github.com:maxiru/canvas-console into develop