cuc u
Merge branch 'master' of github.com:mydipcom/PortalA4Data

Conflicts:
	CamprayPortal/Presentation/CamprayPortal.Web/Administration/sitemap.config