#inheritance in progress
Merge branch 'master' of https://github.com/mihaistoie/histria

Conflicts:
	src/Histria.Model/Model/ClassInfoItem.cs