Code Pro fixes

Line length and final variables
kpmartin
Code Pro

javadoc, variables that should be final, and line length
Merge remote-tracking branch 'origin/team9dev' into GUIFixes_Quan
Merge remote-tracking branch 'origin/team9dev' into GUIFixes_Quan
Merge pull request #153 from dbeckwith/GUIFixes_Quan

Gui fixes quan
Merge branch 'team9dev' into user_bug_fixes