add options import
add optionvalue migration
Conflicts:
	civimigrate.info
add error handling
Conflicts:
	destinations/civicrm_api.inc
sync all these files from d6 version as the 2 versions are out-of-sync & d6 is more up-to-date