Merge branch 'develop' into revise
Updated controller response CORS option
Added web dat folder for file upload
Updated upload function
Merge branch 'revise' into develop