added exclude content with no url
implemented test fixed bug
Merge branch 'develop' of git://github.com/sulu-cmf/SuluWebsiteBundle into hotfix/no-link
Merge branch 'develop' of git://github.com/sulu-cmf/SuluWebsiteBundle into hotfix/no-link

Conflicts:
	Navigation/NavigationMapper.php
Merge branch 'hotfix/no-link' into develop