More build system voodoo
More build system voodoo
More build system voodoo
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Fixed bug in inheritance