changed composer.json
Merge branch 'feature_20140303' into develop