Added grid filter to BlockTypes.ascx and a possible "below footer bg color" fix to developer.less
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	RockWeb/CSS/developer.less