Merge branch 'master' of https://github.com/tanvirt/Faculty-Activity-Report
Syntax change to better represent which controller is used
Merge branch 'master' into andrew