modified for FB
modified base.js
Merge branch 'master' into gh-pages