small bugfix in 'Theme Options'
Merge branch 'master' of github.com:aristath/shoestrap
Merge branch 'master' of github.com:aristath/shoestrap
some NavBar styling impros