Merge branch 'release/v1.1.4' into develop
Temporary fix for odd Bootstrap behavior with data-toggle buttons
Submodule update
Bump version numbers
Merge branch 'release/1.1.5'