import wizard part2
Merge remote-tracking branch 'upstream/master' into new_import

Resolved Conflicts:
	app/views/charts/datasets.blade.php