Merge branch 'release/2.3.3' into develop
Merge branch 'hotfix/2.3.4' into develop
Merge branch 'hotfix/2.3.5' into develop
upgrade from Bootstrap3 RC1 to stable
setting default column count to 50
Changelog update
Merge branch 'release/2.3.6'