merge
Merge branch 'master' of https://github.com/Ant-keke/YoungSkilledCMS
first entities created - inheritance and association persistance handled