merge
Merge branch 'master' of github.com:codarchlab/arachnefrontend
merge
Merge branch 'master' of github.com:codarchlab/arachnefrontend
modals out of controller
Merge branch 'master' of github.com:codarchlab/arachnefrontend