Updated Bootstrap.
Merge branch 'release/1.5'
fixed sorting bug in alerts.php
Merge branch 'hotfix/alertSorting' into develop