Merge pull request #3 from gynsolomon/master

final code before release
[yanan] change response of SignInActivity when service cannot access server
Merge remote-tracking branch 'upstream/master'