+ fixed hfItemRestUrlExtraParams value get always getting set correctly in CategoryPicker
+ changed itemPicker selector for hfItemRestUrlExtraParams back to $('#hfItemRestUrlExtraParams_' + controlId). $('#' + controlId + ' [id*="hfItemRestUrlExtraParams"]') was returning "undefined" for me.  I tried in both Firefox and IE, and $('#hfItemRestUrlExtraParams_' + controlId) works. Maybe it was changed to try to fix the issue in CategoryPicker?
fix up itemPicker.js for cases where the javascript exists, but the itemPicker disappeared (like if it was on a panel that got hidden, and it was an partial postbback)
fixed up RowEventArgs do that you can use e.RowKeyId instead of (int)e.RowKeyValue. Now it really works!
fixed up bug where you couldn't delete a DefinedType
fix some bugs on Save in MarketingCampaignAdTypeDetail
Updates to support person merge syncs
Redo migrations after merging
+ fix small bug in MarketingCampaignAdsXslt (will be used for Residency)
+ (hopefully) fixed hard-to-fix weird "Failed to load ViewState..." error.  After trying all kinds of things, turning off Paging on the Audience Grids fixed it
Merge branch 'origin/develop'
Add code to keep database up-to-date when automigrate is enabled
Merge branch 'develop'

Conflicts:
	RockWeb/App_Code/Global.asax.cs