Merge remote-tracking branch 'refs/remotes/upstream/develop' into develop
some work for giving profile
Cherry pick financial GivingProfileList from bcp-financepages
Missing XML
Merge branch 'refs/heads/develop' into feature-ds-refactorgiving

Conflicts:
	Rock/Rock.csproj