Switched to single sulu repo
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into merge_repos

Conflicts:
	composer.lock
Merge pull request #366 from sulu-cmf/merge_repos

Switched to single sulu repo