Merge branch 'master' into reset-stylesheet

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cartoassets",
   "description": "Share frontend assets between different CartoDB repositories",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "homepage": "https://github.com/cartodb/CartoAssets",
   "author": {
     "name": "xavijam",

src/scss/cdb-components/colors.scss

@@ -15,7 +15,7 @@
 ``` 
 */
 
-@import '../variables/colors';
+@import '../cdb-variables/colors';
 
 .box {
   width: 120px;

src/scss/cdb-components/loader.scss

@@ -12,7 +12,7 @@ There is only one state 'is-visible', in order to make it visible.
 ```
 */
 
-@import '../utilities/mixins';
+@import '../cdb-utilities/mixins';
 
 .CDB-Loader {
   @include css3-prefix(animation, loader-progress 1000ms linear 1);

src/scss/cdb-components/shapes.scss

@@ -12,7 +12,7 @@ You may resize and change the colors of the icons with the `glyph-`-classes. Ava
 ```
 */
 
-@import '../utilities/mixins';
+@import '../cdb-utilities/mixins';
 
 .CDB-Shape-dot {
   display: inline-block;

src/scss/cdb-components/typography.scss

@@ -14,7 +14,7 @@
 ```
 */
 
-@import '../variables/sizes';
+@import '../cdb-variables/sizes';
 
 .Text {
   font-family: 'Open Sans';