change config
Merge branch 'master' of git://github.com/vitiko/IphpFileStoreBundle

Conflicts:
	composer.json