Fix duplicate dajaxice imports in settings.py
Merge branch 'slickgrid' of github.com:visgence/portcullis into slickgrid