Merge branch 'master' into gh-pages
test bootstrap path issue
test console.log
bootstrap mess fix 1
bootstrap variables activated
Merge branch 'gh-pages'