fixs
Merge branch '538_github_connector' of github.com:meverone/intranet into 538_github_connector