added login choice for admins
resolved conflicts
Merge branch 'master' of https://github.com/ProftaakgroepC/ProftaakCode