Added XML support
Merge pull request #91 from WouterJ/xml_support

Added XML support
adjust to publish workflow refactoring
Merge remote-tracking branch 'origin/master' into publishworkflow

Conflicts:
	ContentAwareFactory.php
	Tests/Unit/ContentAwareFactoryTest.php
Bug fix: LinkType not retunred in options
Merge pull request #94 from dantleech/bug_fix

Bug fix: LinkType not retunred in options
we have a no-op service rather than no publish workflow service if its disabled
Merge pull request #92 from symfony-cmf/publishworkflow

adjust to publish workflow refactoring
Merge remote-tracking branch 'origin/master' into simplify-admin