neurana_updates
Merge branch 'devel-share' of github:rhodricusack/automaticanalysis into devel-share
resolve conflict with neurana
updates from neurana
resolved setcurrenttask conflices