Implemented inheritance changes within the classes
Implemented Error Message Widget
Merge branch back to master use ours