Merge branch 'master' of github.com:rainforestapp/queue_classic_admin into redirect

Conflicts:
	app/controllers/queue_classic_admin/queue_classic_jobs_controller.rb
Merge pull request #14 from rainforestapp/redirect

Redirect to the same page when deleting or unlocking