Updated with the latest that Rob has produced.
Taxonomy update now that Lede and More are coming from CSV rather than taxonomy_override.
Updated taxonomy generation so that lede and more text come from Taxonomy.csv
Balance of payments is now National Accounts.
No more manually-edited taxonomy override files. Hurrah!
Merge branch 'master' of github.com:ONSdigital/tredegar

Conflicts:
	src/main/taxonomy/businessindustryandtrade/businessactivitysizeandlocation/data.json
	src/main/taxonomy/businessindustryandtrade/changestobusiness/businessbirthsdeathsandsurvivalrates/data.json
	src/main/taxonomy/businessindustryandtrade/changestobusiness/mergersandacquisitions/data.json
	src/main/taxonomy/businessindustryandtrade/constructionindustry/data.json
	src/main/taxonomy/businessindustryandtrade/internationaltrade/data.json
	src/main/taxonomy/businessindustryandtrade/itandinternetindustry/data.json
	src/main/taxonomy/businessindustryandtrade/manufacturingandproductionindustry/data.json
	src/main/taxonomy/businessindustryandtrade/retailindustry/data.json
	src/main/taxonomy/businessindustryandtrade/tourismindustry/data.json
	src/main/taxonomy/economy/economicoutputandproductivity/data.json
	src/main/taxonomy/economy/environmentalaccounts/data.json
	src/main/taxonomy/economy/governmentpublicsectorandtaxes/publicsectorfinance/data.json
	src/main/taxonomy/economy/governmentpublicsectorandtaxes/researchanddevelopmentexpenditure/data.json
	src/main/taxonomy/economy/grossdomesticproductgdp/data.json
	src/main/taxonomy/economy/grossvalueaddedgva/data.json
	src/main/taxonomy/economy/inflationandpriceindices/data.json
	src/main/taxonomy/economy/investmentspensionsandtrusts/data.json
	src/main/taxonomy/economy/nationalaccounts/data.json
	src/main/taxonomy/economy/regionalaccounts/data.json
	src/main/taxonomy/employmentandlabourmarket/peopleinwork/earningsandworkinghours/data.json
	src/main/taxonomy/employmentandlabourmarket/peopleinwork/employmentandemployeetypes/data.json
	src/main/taxonomy/employmentandlabourmarket/peopleinwork/labourproductivity/data.json
	src/main/taxonomy/employmentandlabourmarket/peopleinwork/workplacedisputesandworkingconditions/data.json
	src/main/taxonomy/employmentandlabourmarket/peoplenotinwork/data.json
	src/main/taxonomy/employmentandlabourmarket/publicsectorpersonnel/data.json
	src/main/taxonomy/peoplepopulationandcommunity/birthsdeathsandmarriages/adoption/data.json
	src/main/taxonomy/peoplepopulationandcommunity/birthsdeathsandmarriages/ageing/data.json
	src/main/taxonomy/peoplepopulationandcommunity/birthsdeathsandmarriages/conceptionandfertilityrates/data.json
	src/main/taxonomy/peoplepopulationandcommunity/birthsdeathsandmarriages/deaths/data.json
	src/main/taxonomy/peoplepopulationandcommunity/birthsdeathsandmarriages/divorce/data.json
	src/main/taxonomy/peoplepopulationandcommunity/birthsdeathsandmarriages/families/data.json
	src/main/taxonomy/peoplepopulationandcommunity/birthsdeathsandmarriages/lifeexpectancies/data.json
	src/main/taxonomy/peoplepopulationandcommunity/birthsdeathsandmarriages/livebirths/data.json
	src/main/taxonomy/peoplepopulationandcommunity/birthsdeathsandmarriages/marriagecohabitationandcivilpartnerships/data.json
	src/main/taxonomy/peoplepopulationandcommunity/birthsdeathsandmarriages/maternities/data.json
	src/main/taxonomy/peoplepopulationandcommunity/birthsdeathsandmarriages/stillbirths/data.json
	src/main/taxonomy/peoplepopulationandcommunity/crimeandjustice/data.json
	src/main/taxonomy/peoplepopulationandcommunity/culturalidentity/ethnicity/data.json
	src/main/taxonomy/peoplepopulationandcommunity/culturalidentity/language/data.json
	src/main/taxonomy/peoplepopulationandcommunity/culturalidentity/religion/data.json
	src/main/taxonomy/peoplepopulationandcommunity/culturalidentity/sexuality/data.json
	src/main/taxonomy/peoplepopulationandcommunity/elections/data.json
	src/main/taxonomy/peoplepopulationandcommunity/healthandsocialcare/conditionsanddiseases/data.json
	src/main/taxonomy/peoplepopulationandcommunity/healthandsocialcare/disability/data.json
	src/main/taxonomy/peoplepopulationandcommunity/healthandsocialcare/drugusealcoholandsmoking/data.json
	src/main/taxonomy/peoplepopulationandcommunity/homeinternetandsocialmediausage/data.json
	src/main/taxonomy/peoplepopulationandcommunity/housing/data.json
	src/main/taxonomy/peoplepopulationandcommunity/leisureandtourism/data.json
	src/main/taxonomy/peoplepopulationandcommunity/personalandhouseholdfinances/debt/data.json
	src/main/taxonomy/peoplepopulationandcommunity/personalandhouseholdfinances/expenditure/data.json
	src/main/taxonomy/peoplepopulationandcommunity/personalandhouseholdfinances/incomeandwealth/data.json
	src/main/taxonomy/peoplepopulationandcommunity/populationandmigration/internationalmigration/data.json
	src/main/taxonomy/peoplepopulationandcommunity/populationandmigration/migrationwithintheuk/data.json
	src/main/taxonomy/peoplepopulationandcommunity/populationandmigration/populationestimates/data.json
	src/main/taxonomy/peoplepopulationandcommunity/populationandmigration/populationprojections/data.json
	src/main/taxonomy/peoplepopulationandcommunity/wellbeing/data.json
Merge branch 'master' of github.com:ONSdigital/tredegar
src/main/taxonomy/peoplepopulationandcommunity/healthandsocialcare/conditionsanddiseases/data.json

Reverting manual changes made to check differences.