Finally got this freaking fb auth working.
resolved some conflicts
Merge branch 'master' of github.com:walkingtowork/cake_adventure
syncing up the things with alexs images