local changes.
Merge branch 'master' of github.com:facebook/facebook-android-sdk

Conflicts:
	facebook/.classpath
local changes
fixed merge conflicts