changed composer.json
Merge branch 'feature_20140605' into develop