Updated namespaces. Now with vendor.
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json
Updated namespaces. Now with vendor.