Signed-off-by: acorse <Anthony@10.41.51.32>
Update callback uri
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/m2mop/OAuthTest/MyActivity.java