Added Styles and Bootswatch Theme
fix merge conflicts
Merge branch 'frontend'