update

value and type specified for fids
updated

updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	csv2xmlv2.rb
updated

updated