Merge pull request #3 from sphere/staging

Staging
new invite
Merge pull request #6 from sphere/xinyan

Xinyan