CDB-3497 Added a as superadmin to import_cleanup to dodge some possible timeouts. but inside cartodbfication can still fail with low values
CDB-3497
CDB-3497 Updated submodule
Merge branch 'master' into CDB-3497

Conflicts:
	app/models/user.rb
Merge branch 'master' into CDB-3497

Conflicts:
	lib/importer/lib/cartodb-migrator/migrator.rb
CDB-3497 Bugfix for missing fully qualified path
CDB-3696 small cleanup of dead code
CDB-3497 upped extension version
Merge branch 'CDB-3696' of github.com:CartoDB/cartodb into CDB-3696
CDB-3696 Moar routes
CDB-3696 #resolve - added locked tables in the dashboard
Merge branch 'master' into CDB-3497

Conflicts:
	app/models/user.rb
CDB-3497 trying to fix travis timeouts
CDB-3497 travis repos are outdated, apt-get update is required or postgres fails
Merge branch 'master' into CDB-3696
Merge pull request #645 from CartoDB/CDB-3497

CDB-3497
CDB-3936 #resolve - added message in locked tables when it is shared with any user
Merge branch 'CDB-3696' of github.com:CartoDB/cartodb into CDB-3696
Fixed lock visualization dialog redirects
Merge pull request #654 from CartoDB/CDB-3696

New locked tables section enabled