#1312 small code refactor to be able to change logic and started implementing new state
#1312 More refactor, code now handles enqueuing if config active
#1312 Mostly done, flow working and just pending error handling
#1312
Merge branch 'master' into issue-1312

Conflicts:
	NEWS.md
#1312
Merge branch 'master' into issue-1312

Conflicts:
	app/models/data_import.rb
Merge branch 'master' into issue-1312

Conflicts:
	NEWS.md
Fix for #1561 catching errors
Merge branch 'master' into 1561-json_visualizations_controller_fails_for_unlinked_tables
Merge branch 'master' into 1561-json_visualizations_controller_fails_for_unlinked_tables
Merge branch 'master' into 1561-json_visualizations_controller_fails_for_unlinked_tables
Improved error at 400 and return
Added default background for any map card
Adding map owner info
Added mapviews graph for map card item
Merge pull request #1566 from CartoDB/1548-ActionView_MissingTemplate

Improved error at 400 and return
Merge pull request #1562 from CartoDB/1561-json_visualizations_controller_fails_for_unlinked_tables

Fix for #1561 catching errors
#1564 Begun building tests to see if code changes are required or not
Added map card item tests