Merge branch 'ELEGANCE_26'
Update to bootstrap components
Fix for additional slide display
Merge branch 'master' into ELEGANCE_26