canvas template added
Merge branch 'views' into dev
fix conflict
palette template added
Merge branch 'templates' into dev
deleted script upload at index
server upload setuo
Merge branch 'dev' into server
fixed upload
Merge branch 'server' into dev
Merge branch 'dev' into views
commit