!
!
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015
!
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015

Conflicts:
	SRFROWCA/ClusterLead/AddCountryIndicator.aspx
	SRFROWCA/ClusterLead/AddCountryIndicator.aspx.cs
	SRFROWCA/ClusterLead/CountryIndicators.aspx
	SRFROWCA/ClusterLead/CountryIndicators.aspx.cs
	SRFROWCA/ClusterLead/CountryIndicators.aspx.designer.cs
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015

Conflicts:
	SRFROWCA/ClusterLead/AddCountryIndicator.aspx.cs
	SRFROWCA/ClusterLead/AddCountryIndicator.aspx.designer.cs
!
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015

Conflicts:
	SRFROWCA/ClusterLead/AddCountryIndicator.aspx.cs
	SRFROWCA/ClusterLead/CountryIndicators.aspx.cs
	SRFROWCA/ClusterLead/CountryIndicators.aspx.designer.cs
!
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015

Conflicts:
	SRFROWCA/SRFROWCA.csproj
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015
upload framerok
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015
Add Activity and Indicators
Removed Weeks testing
Project file and some toher files
add indicator control
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015

Conflicts:
	SRFROWCA/ClusterLead/CountryIndicators.aspx
	SRFROWCA/ClusterLead/CountryIndicators.aspx.cs
	SRFROWCA/ClusterLead/CountryIndicators.aspx.designer.cs

Fixed conflicts
Add Clsuter Indicators