Refactor gallery bootstrap
Update jasmine and integration tests
Merge branch 'dom-context-8' into dom-context-7