Merge branch 'upstream/develop'

Conflicts:
	Rock/Rock.csproj
Update Rock.csproj

Remove trailing merge comment
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'
Build conflict, removed buggy migration
Fix for duplicate include
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'
Merge branch 'develop-upstream'
Merge branch 'develop-upstream'
Test commit
Merge pull request #14 from SparkDevNetwork/develop

Merge upstream/develop
Merge branch 'upstream/develop'

Conflicts:
	RockWeb/Blocks/Finance/GivingProfileDetail.ascx
Merge branch 'upstream/develop'
Merge branch 'upstream/develop'