CDB-57 #close Adds message explaining how the custom legends work
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop

* 'develop' of github.com:CartoDB/cartodb20:
  CDB-60 CDB-61 CDB-63 #resolve markup issues