added listeners & templates
Merge branch 'views' into dev
fix conflict
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
fixed router
Merge branch 'router' into dev
fixed upload and display canvas
fixed some problems and routing
config style compilation
Merge branch 'styles' into dev
adjust canvas size
Merge branch 'canvas' into dev
fix