Facebook login now an option
Merging
Merge branch 'master' of https://github.com/SourceGroove/Shop