Rough draft omni sort
Merge branch 'dev' of github.com:visgence/django-chucho into dev