working on delayed_job methods
Merge branch 'master' into Design
fixed merge conflicts.