Fixed a bug in the single sign out
Merge branches 'develop' and 'master'