Dont support websocket security , will return this later
Update user infor
Merge commit '161527350904a8d5fe3a8849de750ab544af9a4e'

Conflicts:
	src/main/webapp/assets/modules/common/connection.fac.js
	src/main/webapp/assets/modules/register/register.con.js
Add @NotNull
Optimize imports