Oauth

fixed activity profile test and merged with master