Task server resources methods renamed
Test task submitter improved
Merge remote-tracking branch 'origin/develop' into develop