Merge pull request #594 from sulu-cmf/hotfix/sitemap-alternate

Fixed #588 sitemap alternate link bugs
added changelog
Merge remote-tracking branch 'origin/develop'

Conflicts:
	CHANGELOG.md
adapted upgrade
Merge branch 'master' into develop