refactor, search controllers, template files
Merge branch 'develop' of github.com:zioplox11/Prowl into messaging