updated functionality
Merge branch 'refs/heads/feature-connect-facebook' into develop