Added color matching to metrics for issue #1753
Merge branch 'develop' into feature-reporting
Merge branch 'develop' into feature-reporting
Merge branch 'develop' into feature-reporting
Updated Version
Fixes bug with default data setup, and full update file.
Merge branch 'hotfix'
Updated Version 3.0.11
Merge branch 'master' into develop

Conflicts:
	version.txt
Bugfix for MSSQL vs MySQL on reporting week
Merge branch 'develop' into feature-reporting
Updated BE Version
Updates logic so that Slatwall knows if you are on Stable or Bleeding
Edge.
Merge branch 'develop' into feature-stripe
Started Fixing some of the authorization code issues.