fixed git mishap
timeout working changes not

author: nhhughes
Started work on new session stage initialization

dpseaman
thhughes
Merge branch 'devel' into Ryan_More_Tests
Merge branch 'devel' into Ryan_More_Tests
Merge remote-tracking branch 'origin/devel' into stage_init
Merge branch 'devel' into long-polling
various changes for long pulling

author: nhhughes
Made final changes to initialization Stuff for Columns. 

@THHughes
-Added the member buttons back
-Created a method that cuts a string to fit a number of pixels and wraps
it around (to fit up to two lines).
Changed priority to int
authors srojas
-Fixed the drag and drop behavior
-Double click opens the task edit view, single click does not
-single clicked only used to drag and drop
added my username in case someone has questions <irrelevant>
Merge pull request #33 from SixAppeal/stage_init

Stage init
Merge branch 'devel' into long-polling
Saving changes to merge in from devel...
Merge remote-tracking branch 'origin/devel' into UserExperience_Troy
Fixed Archiving problem.
long pulling time out working!!!!!!!

author: nhhughes wmtemple
merged in changes to drag and drop

author: nhhughes