CDB-218 #resolve
Merge branch 'develop' of github.com:CartoDB/cartodb into develop