More fixes, implemented LockedHorse as a ConfigurationSerializable.
Merge origin/master