fixed git mishap
timeout working changes not

author: nhhughes
Merge branch 'devel' into long-polling
various changes for long pulling

author: nhhughes
Changed priority to int
Merge branch 'devel' into long-polling
long pulling time out working!!!!!!!

author: nhhughes wmtemple
merged in changes to drag and drop

author: nhhughes
merged in devel

author: nhhughes
Merge remote-tracking branch 'origin/devel' into long-polling
Test Cases for Activity

Added Test Cases for the Activity Class. Also add a default constructor
of activities because there wasn't one....
updated button icons in the toolbar

dpseaman
Test Cases for Comments

Wrote test cases for the comments class, Fixed a few missing things in
the Activity Test Cases. (the @Before and @Test) (I know how to write
test cases) (No i dont)
Quick fix to make column icon consistent in size

dpseaman
Added the beginning of Task selection.
Fixed stage movement buttons, including sizes

dpseaman
Merge remote-tracking branch 'origin/devel' into button_icons
Turned on Actual effort for any task not in "New"

dpseaman
figured I'd add an author line, because ego

dpseaman
Some changes in how task equality is checked and some other highlighting help.