Functionality to identify user information from LDAP and roles from the system.
Merge branch 'master' of https://github.com/TomLefley/Electronic-Ticking

Database.java conflicts.