Added categories to task model
Merge remote-tracking branch 'origin/devel' into dpseaman_bug_fixes
Normalized Size

Normalized the size for stat and column editing
Merge branch 'devel' into SIdeBarUIFixes
Adding members to StatisticsView - doesn't work yet

author: dpseaman
added the lists and buttons, but still having issues getting the lists
to actually fill from the global member list
Added ColorComboBox
Merge branch 'devel' into ui-improvements
Merge pull request #68 from SixAppeal/SIdeBarUIFixes

Normalized the size ofSide Barviews
"Rename Stage" instead of "Edit Name"

Author: @akshoop

- I didn’t like the term “Edit Name” in our stage edit view. Changed it
to “Rename Stage”
- Also fixed the Java Doc Copyright in TaskManager. RAY wang, not Ryan
Wang.
Color integration in TaskView
Merge pull request #69 from SixAppeal/shoop_editStageName

"Rename Stage" instead of "Edit Name"
Fixed color integration
Merge branch 'devel' into ui-improvements
added copyright declaration to ColorComboBox.java
Merge pull request #70 from SixAppeal/ui-improvements

Ui improvements
fixed documentation and clean up old files

author: nhhughes
Merge pull request #71 from SixAppeal/nhhughes-bug-fixes

fixed documentation and clean up old files
Fixed Stats view member selection

author: dpseaman, thhughes
fixed dan's merge conflicts

author: nhhughes
Fixed the task Ghosting