Updated OAuth class with dev server URLs and keys
Merge branch 'dev' of https://github.com/SocialHeat/SocialHeat-Android-app into dev
Merge branch 'dev' of https://github.com/SocialHeat/SocialHeat-Android-app into dev
changed some icons