Fix composer info
Merge branch 'master' into development

Conflicts:
	composer.json
Added documentation
Merge branch 'development'