Merged from OpenRefine master

Conflicts:
	.gitignore
	README.md
	build.xml
	extensions/freebase/module/scripts/dialogs/freebase-loading-dialog.html
	extensions/freebase/module/scripts/dialogs/schema-alignment/ui-node.js
	main/src/com/google/refine/importing/ImportingJob.java
	main/src/com/google/refine/importing/ImportingManager.java
	main/src/com/google/refine/process/ProcessManager.java
	main/webapp/modules/core/MOD-INF/controller.js
	main/webapp/modules/core/about.html
	main/webapp/modules/core/error.vt
	main/webapp/modules/core/index.vt
	main/webapp/modules/core/langs/translation-default.json
	main/webapp/modules/core/langs/translation-en.json
	main/webapp/modules/core/langs/translation-it.json
	main/webapp/modules/core/preferences.vt
	main/webapp/modules/core/project.vt
	main/webapp/modules/core/scripts/index/parser-interfaces/separator-based-parser-ui.js
	main/webapp/modules/core/scripts/project.js
	main/webapp/modules/core/scripts/project/browsing-engine.js
	main/webapp/modules/core/scripts/views/data-table/cell-ui.js
	refine
	server/src/com/google/refine/Refine.java