Added back bootstrap theme
Merge branch 'development'