Some changes
Merge branch 'master' of https://github.com/cgollner/facebook-android-sdk