did some work laying the ground work for a report geneartion

author: nhhughes
fixed merge
Merge remote-tracking branch 'origin/devel' into ViewArchivedTask2
@author srojas
Filtering through archived tasks works
fixing the view