Merge pull request #187 from redaxmedia/master

Master to Develop
Update composer.json
Hotfix provider for DirectoryTest
Merge branch 'develop'
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json