Merge branch 'master' into issue_477
requirements: upgrade ldap packages settings: remove NISGroupType Conflicts: circle/dashboard/models.py requirements/base.txt
requirements: upgrade ldap packages settings: remove NISGroupType Conflicts: circle/dashboard/models.py requirements/base.txt