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
fixed how our app initiliazes all our data and fixed create panel bug

author: nhhughes
Merge branch 'long-polling' into devel