Merge branch 'hotfix/excerpt'
Merge branch 'hotfix/list-to-tree'
Merge branch 'hotfix/rss-startpage'
Merge branch 'hotfix/slash-url'
fixed empty data
added test case
added multiple children on empty node
Merge branch 'hotfix/empty-tree-values'
Merge branch 'hotfix/empty-tree-values' into develop
fixed url generation
removed next char point
renamed exception var
Merge pull request #296 from sulu-cmf/hotfix/shadow-smart-content

Fixed url generation for shadow pages in smart content
Merge branch 'master' of git://github.com/sulu-cmf/sulu into develop
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into develop
updated version numbers
Merge branch 'master' of git://github.com/sulu-cmf/sulu into develop

Conflicts:
	composer.json
fixed locale bug
Merge branch 'master' of git://github.com/sulu-cmf/sulu
updated version numbers