More fixes

Conflicts:
	data/Job.php
Merging
Fixing bugs and improving abstraction for the JQ functionality

Conflicts:
	data/Job.php
Merging
Removing dependencies

Conflicts:
	data/Job.php
Merging