Changes in report
Conflict resolved
Added username and password to the staff
Merge branch 'master' of https://github.com/technomicssolutions/smartbook