Merge branch 'master' into 1.1.0-wip
simplified the sidebars, bumped version
Merge branch '1.0.2' into 1.1.0-wip

Conflicts:
	readme.md
added default bootstrap theme css
Merge branch '1.1.0-wip'
Merge branch 'master' of https://github.com/bigspring/monolith