composer version update
delete composer vendor.
Merge branch 'master' of github.com:Surt/Granada

Conflicts:
	composer.json