upload & canvas view
canvas template added
added listeners & templates
Merge branch 'views' into dev
fix conflict