Bug fix for JSON parsing error if no agent change is sent
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/ordered_instances_controller.rb
	app/controllers/single_file_instances_controller.rb
Add comments