Calendar and client: Moved login check to before the html
Merge branch 'master' of https://github.com/Mekapaedia/appiont