#1108
Merge branch 'master' of https://github.com/yupe/yupe
enable bootstrap on frontend + small fix
fix theme
closed #1115