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

Conflicts:
	SRFROWCA/Controls/IndicatorsWithAdmin1TargetsControl.ascx
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015
UI to pull Units on language
New menu in master
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015

Conflicts:
	SRFROWCA/Controls/NewCountryIndicatorsControl.ascx
	SRFROWCA/SRFROWCA.csproj
resource files
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015

Conflicts:
	SRFROWCA/Admin/ConfigSettings.aspx
	SRFROWCA/ClusterLead/AddCountryIndicator.aspx.cs
	SRFROWCA/ClusterLead/ClusterDataEntry.aspx.cs
	SRFROWCA/ClusterLead/CountryIndicators.aspx.cs
	SRFROWCA/ClusterLead/CountryIndicators.aspx.designer.cs
	SRFROWCA/Configurations/ChangeEndSettings.xml
	SRFROWCA/Controls/NewCountryIndicatorsControl.ascx.cs
Ebola changes
Merge branch 'SRP2015' of https://github.com/iMMAP/PerformanceMonitoringApp into SRP2015

Conflicts:
	SRFROWCA/Ebola/AllData.aspx
	SRFROWCA/Ebola/AllData.aspx.cs
	SRFROWCA/Ebola/AllData.aspx.designer.cs
	SRFROWCA/SRFROWCA.csproj