added facebook login capabilities.
after pull commit. Resolved conflict.
Merge branch 'master' of https://github.com/tomoueda/Picky