add 2 facebook API
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev