Merge pull request #17 from oyvinmar/master

Added bootstrap themes
Admin filterCheck for settings in router was on a non existing route
Merge remote-tracking branch 'upstream/master'