clean code
Merge branch 'master' of https://github.com/changyou/xocean
Merge pull request #21 from meterler/master

merge
clean code
disable dummydata
fixbug signup and change currentUser