admin loggin
Conflicts:
admin features
dbv administrator and lecturer_units
Merge branch 'develop' of https://github.com/bakasajoshua/TicketingSystem into develop
some changes