Merge branch 'master' of https://github.com/peersafe/PeerSafe

Conflicts:
	src/oauth
Merge branch 'master' of https://github.com/peersafe/PeerSafe

Conflicts:
	src/oauth