fixing controller
Merge branch 'master' of https://github.com/plansys/plansys
Merge branch 'master' of https://github.com/plansys/plansys
Merge branch 'master' of https://github.com/plansys/plansys
fixing report ctrl
Merge branch 'master' of https://github.com/plansys/plansys