Adds handling for non_field_errors
Handles differently field choices
Merge branch 'master' of git@github.com:jlcaro/django-bootstrap-toolkit.git