Merge pull request #62 from ancorgs/job_templates

Rebasing devel into job_templates