Merge pull request #17 from left23/master

Farm conveyor improvements
jigs.php?
jigs.php?
renamed iduser to id
renamed iduser to id
attempt to properly sync upstream and master