upgrade to Bootstrap3
Merge branch 'release/2.3.0' into develop