+ Fixed bug in grid.js where the Delete might not work
+ Updated GroupRoles to List/Detail
+ Update PageRoutes to List/Detail
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

Conflicts:
	Rock/Rock.csproj
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop