arcgis parser

Signed-off-by: A. van der Pluijm <info@urbanlink.nl>
Merge branch 'develop' of https://github.com/urbanlink/columby into develop

Signed-off-by: A. van der Pluijm <info@urbanlink.nl>

Conflicts:
	drupal/sites/all/modules/custom/columby_upload/columby_upload.module
upload iati

Signed-off-by: A. van der Pluijm <info@urbanlink.nl>