Merge branch 'origin/develop'
Initial check-in for residency theme
Residency theme updates.
Merge branch 'origin/develop'

Conflicts:
	RockWeb/Themes/Residency/Layouts/Dialog.aspx
	RockWeb/Themes/Residency/Layouts/Dialog.master
	RockWeb/Themes/Residency/Layouts/Dialog.master.cs
	RockWeb/Themes/Residency/Layouts/PersonDetail.aspx
	RockWeb/Themes/Residency/Layouts/PersonDetail2.aspx
	RockWeb/Themes/Residency/Layouts/TwoColumnLeft.aspx
Merge branch 'develop'
Merge branch 'develop' (using version of Core prior to LocationType update, which is prior to ColorType field, so that arena is compatible)
Merge branch 'origin/develop'
Updates to get migrations running on prod db.
Merge branch 'origin/master'