restored collapse fix
Merge branch 'moodle_25' of github.com:/bmbrands/theme_bootstrap into moodle_25