Ammend forgotten classes
Merge branch '3.1.0' of github.com:UnBiquitous/uos_core into 3.1.0