Can distinuish between normal bootstrap and AngularJS bootstrap
Adopted to latest version of DjangoCMS
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cmsplugin_cascade/bootstrap3/carousel.py
update animate option to use CheckboxSelectMultiple