changed directory structure
changed phpunit setting file
changed composer.json
Merge branch 'feature_20140313' into develop