Merge branch 'release/1.1.3' into develop
Updated to bootstrap 2.2
Merge branch 'release/1.1.4'