Merge master into centralAffordances

This brings centralAffordances up-to-date with the master branch. Looks like things will merge ok.

Adds in some IRL things, the StateJSONParser and some other updates

@david-abel Please review