Merge branch 'facebook_auth' of github.com:jasonleibowitz/moker_app
Merge branch 'development'