add nasreen grid code
mod to nasreen
fix conflicts

Merge branch 'master' of github.com:swish-climate-impact-assessment/AWAP_GRIDS

Conflicts:
	main.r
	tests/test-pgListTables.r
	tests/test-readGDAL2.r