undo commenting of previous tests only one fails
fixed merging bug
Merge branch 'master' of https://github.com/tanvirt/Faculty-Activity-Report
added patents to report
Merge pull request #81 from tanvirt/Greg

added patents to report
Update report.server.model.js
Update report.server.model.js
Update report.server.model.js
Update report.server.controller.js
Merge pull request #82 from tanvirt/consultations2

Consultations2
added consultationsOutsideUniversity to report
Update reports.client.controller.js
Merge pull request #83 from tanvirt/consultations2

Consultations2
Merge branch 'master' into conferences