pluralize controller names
Merge branch 'develop' of github.com:twg/pms-server into develop