Moved job name generation to model, from controller
Merge branch 'develop-nigel' into develop