fixed composer.(json|lock)
renaming project for composer
composer - fixed renamed deps
Merge branch 'master' into 1.0

Conflicts:
	composer.json
	composer.lock
composer - fixed