Merge branch 'master' of https://github.com/FityFity/UBO

Conflicts:
	wsgi/static/ubo/xdevops/ubo_userinfo.js