changed doctrine annotations to xml mappings
Added missing properties and removed inherited fields
Merge remote-tracking branch 'origin/master' into xml-mappings

Conflicts:
	Document/StaticContent.php