Fix Bootstrap issue
Merge branch 'master' into build
gb
Clean up booking-factory
gb & git merge