Merge branch 'master' into develop
Updated bootstrap to version 2.3.1 plus other minor tweaks
Merge branch 'feature/update-bootstrap-2.3.1' into develop
Merge branch 'develop'
Merge branch 'master' of github.com:gpmd/ss-bootstrap