working on facebook
facebook and local logins working :cat:
facebook and local login are working :beer: :beer:
tests related to my stuff seem to be OK
merged in master
fixing merge from master
fixed register and login redirects
facebook and local logins are working with all tests passing
Merge pull request #4 from RJFryman/facebook

Facebook
Merge branch 'master' into QA-branch