fixed codepro complaints for files in controller folder
author: quan1992
Various Code Pro Fixes

kpmartin
Fixes Tests

kpmartin
Merge pull request #135 from dbeckwith/GUIFixes_Quan

Gui fixes quan