Log in with Twitter PoC working.
(cherry picked from commit c1ff0f2)
Log in with Facebook PoC.
(cherry picked from commit 3155b0a)
Merge branch 'master' into socialLogin
FTT-26 Changes to social login stuff based on review feedback.
Merge branch 'master' into socialLogin

Conflicts:
	mobile/src/main/AndroidManifest.xml
Make compile after the merge
Merge pull request #2 from TruckMuncher/socialLogin

Social login