Changes the order of the legend params to make them alike
Merge branch 'release/staging' of github.com:CartoDB/cartodb into release/staging

* 'release/staging' of github.com:CartoDB/cartodb:
  CDB-145 #resolve [importer] Support files with Cyrillic encoding
  CDB-138 #resolve, pattern background in asset