synchronization with fblibrary branch
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
formatting
Merge branch 'master' into beta