fixed Commodity generics
Added second constructorr for TimeShifterRegistration
Merge branch 'development' into messaging-framework