Merge branch 'upstream/master'
Merge branch 'upstream/master'

Conflicts:
	Rock.Rest/Properties/AssemblyInfo.cs
	Rock.Rest/Rock.Rest.csproj
Merge branch 'develop'
Mass updates to master
Merge branch 'upstream-master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Rock/Data/DbContext.cs
Update to Rock v14
Move NS labels to Rock\Checkin
Merge branch 'master' into develop