implemented BOOTSTRAP as framework for layout
Merge master into martin