Merge branch 'master' of github.com:CartoCosmos/CartoCosmos into testing