fix not to copy from bootstrap but to use import.
Merge branch 'develop'
Merge branch 'master' into gh-pages
update