NullBooleanChoiceField is also a choice field.
Fixed order_by for non-choice fields.
Merge branch 'development' of github.com:wlanslovenija/nodewatcher into development