Update UserLogin UserName to be unique
Fixing syntax bug in HTML.
Merge branch 'develop' of github.com:SparkDevNetwork/Rock-ChMS into develop
fix bug in Grid where if DisplayType was set to Light, you could get a "Failed to load Viewstate..." exception.  When our Grid DisplayType=Light, AllowPaging is supposed to be set to "False".  However, it gets set to false in the OnDataBound event.  So, the first time the grid is built, is actually shows the pager because OnDataBound was fired AFTER the PagerRow is created.  But, if there is partial postback (page navigation, delete click, etc), AllowPager is properly set to False, but now there is one less control in the grid.  This caused the "Failed to load Viewstate..." exception.
Merge branch 'origin/develop'
changed MarketingCampaignDetail AudienceType grids back to what they were now that the Grid bug is fixed
fixed up compiler warnings
Merge branch 'develop'