merge
Merge branch 'master' of github.com:CartoDB/cartodb-publishing-templates
pping for release