Revert "packaging :P"

This reverts commit 8061d064273e9dfd6600962fc221b140d5890014.
packaging :P
Merge origin/master

Conflicts:
	composer.json