google callback error fixed
Merge branch 'develop' of github.com:joshsoftware/intranet into develop