Include bootstrap in js
Merge branch 'next'