fixed composer json
fixed namespace bug
Update composer.json
fixed smart content bug
adopted version number
Merge branch 'master' into develop

Conflicts:
	composer.json
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into develop