Merge pull request #3 from samuele3hu/master

fix some bugs
fix logout crash bug
fix conflix