Changed composer.json
Merged develop
Cleaning up
changed package name