several fixes
Merge branch 'refs/heads/feature-facebook-connect' into develop