proper bootstrap markup for example app
Merge branch 'rc' into example_app_markup
Merge branch 'example_app_markup' into rc