test
Merge remote-tracking branch 'FlipBook/master'
fixed bug when logging out
test
Merge remote-tracking branch 'FlipBook/master'