- Rock Plugin Project
Merge branch 'origin/develop'

Conflicts:
	Rock.sln
- More plugin changes
+ Update attribute editor to do a better job of checking for keys already being used and not allow saving an attributes with a duplicate key. (Fixes #449)
- Update all the places Attribute Editor is used to set the ReservedKeyNames property so that it can validate duplicate keys.
- changed the color of wells on panels
-
- theme updates
- update populate_metrics.sql to include EntityTypeId in metric
- fix Linq exception in CategoriesController when dealing with Metric categories
- added MetricValueType to GoogleChart/MetricValuesController
- dashboard theme updates
- fix up url for metricsvalue controller
- update dashboardwidget to generate divs for the dashboard theme
- added MetricsValueController.GetByMetricId()
- Start workflow form entry block
Merge branch 'origin/develop'
- Update version to 1.0.8
- added new MetricEntityPicker, MetricEntityFieldType, and MetricEntityFieldAttribute which can be used to set the Metric and Entity filter for a Dashboard block
- DashboardWidget now has block attributes for Metric Value Type, Metric (Metric Entity), and Detail Page
- added MetricEntityPicker to RockControlGallery
- added GetEntityFromContext and CombineValues getters to DashboardWidget
- More workflow form changes
- changed DataFilters to store selection values for entities as the entity's guid value instead of id value