fixing bugs
polishing charts page
import wizard part1
Merge remote-tracking branch 'upstream/master' into new_import

Kept all changes from upstream/master in order to resolve the following conflicts:
	app/views/charts/chp.blade.php
	app/views/charts/datasets.blade.php
	app/views/charts/mycharts3.blade.php
	app/views/charts/table.blade.php