fb-connect
fb-connect2
conflicts resolved
Merge branch 'fb-connect'