change the facebook app id and app secret in FacebookConfig.java
Merge remote-tracking branch 'origin/master'