Update 1.52 by Mawin
Merge branch 'master' of https://github.com/intelhat/intranet