Show jobtype column in jobs list
Merge remote-tracking branch 'guidow/jobtype_in_jobs_list'

Conflicts:
	pyfarm/master/templates/pyfarm/user_interface/jobs.html