fix if statement to choose input/number widget based on django version
add option to animate bootstrap carousel by adding slide class
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cmsplugin_cascade/bootstrap3/carousel.py
update animate option to use CheckboxSelectMultiple
bootstrap3.carousel options to use default_css_attributes instead of overriding get_css_classes
Merge remote-tracking branch 'upstream/master'
Add jsonfield to pip/setup.py requirements

jsonfield is not automatically installed with pip. Now it does
Added 960.gs to the documentation
Unified naming for placeholders
Reduced the number of possible columns
Updated docs
Refactored the docs
Thanks to jotielim for reporting this
Using correct release
Updated docs
Thanks to siterra for pointing out this missing configuration option
Merge pull request #8 from asmaps/patch-2

Add jsonfield to pip/setup.py requirements
Merge pull request #4 from jotielim/master

add option to animate the carousel for bootstrap3
Merge branch 'master' of github.com:jrief/djangocms-cascade
Reverted #4 partially, bugfix