status model added
Merge branch 'model' into dev
upload & canvas view
canvas template added
added listeners & templates
Merge branch 'views' into dev
fix conflict
palette template added
Merge branch 'templates' into dev
deleted script upload at index
Merge branch 'dev' into server
fixed upload