Merge pull request #14 from vinsol/staff-login

Staff login
Merge branch sprint-3 into staff-appointments and fix conflicts.
Merge pull request #15 from vinsol/staff-appointments

Staff appointments
Merge branch sprint-3 into mail and resolve conflicts.