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