CDB-138 #resolve, pattern background in asset
Merge branch 'release/staging' of github.com:CartoDB/cartodb into release/staging