bug fix ... now will be able to upload non ASCII characters
updates to import socrata json
Merge remote-tracking branch 'origin/master'

Conflicts:
	ini/server.ini
ignor server.ini