rewrite nokia urls CDB-2016
updated cartodb.js
Merge remote-tracking branch 'origin/CDB-2016'

Conflicts:
	vendor/assets/javascripts/cartodb.uncompressed.js