Merge branch 'develop' of git://github.com/sulu-cmf/SuluWebsiteBundle into hotfix/internal-link-redirect
Merge branch 'hotfix/internal-link-redirect' of git://github.com/sulu-cmf/SuluWebsiteBundle into hotfix/internal-link-redirect