changed composer.json
changed Xml/ContentGenerator class
Merge branch 'feature_20140605' into develop