Adding composer instructions
Merge branch 'master' into 2.dev

Conflicts:
	README.md