fixed locale bug
Merge branch 'master' of git://github.com/sulu-cmf/sulu
updated version numbers
fixed undefined index: 'children'
Merge branch 'hotfix/empty-tree' into develop

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