Merge branch 'master' into issue_477
requirements: upgrade ldap packages settings: remove NISGroupType Conflicts: circle/dashboard/models.py requirements/base.txt
A prog2-höz tartozó friss repo anyagok itt elérhetőek: https://git.iit.bme.hu/
requirements: upgrade ldap packages settings: remove NISGroupType Conflicts: circle/dashboard/models.py requirements/base.txt