swapped NP's coral. applying eez2013 functions.R to other eez scenarios

Swapped coral and rocky reef habitats back to original 2013 which for coral uses GL-UNEP-Coral not Halpern2008.
fixing merge conflicts

Merge branch 'master' of github.com:bbest/ohi-global

Conflicts:
	eez2012/conf/functions.R
	eez2012/scores.csv
	eez2013/scores.csv
	eez2014/conf/functions.R