Merge branch 'master' of https://github.com/era-project/era-indicators.git

Conflicts:
	USAID ERA Indicator Table FY2014_V1.1.xlsx

Signed-off-by: psdiop <psdiop@oired.vt.edu>
solved conflict