Init deploy branch
Chaneg the websocket port to 80
Change the redirect after logged in
Merge branch 'deploy' into develop