Trying to debug logging in via facebook for new site
Merge branch 'master' into location_two