Updated composer file
updated read me
Merge branch '3.0'
Merge branch 'master' into 3.1

Conflicts:
	README.md