Merge branch 'master' of github.com:arnapou/FileStore

Conflicts:
	src/Arnapou/FileStore/ModuleUpload.php
Merge branch 'master' of github.com:arnapou/FileStore