canvas to print
Merge branch 'dev'