Committing to push my changes to my dev branch so I can work on this on another computer.
Committing changes to crops.js to avoid a merge conflict.
Merge branch 'master' into Byron-Dev-Branch

Conflicts:
	system_models/crops.js

OK, now I fixed the merge.