#101 - merge develop

static/font/css/fontello.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?23060348');
-  src: url('../font/fontello.eot?23060348#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff2?23060348') format('woff2'),
-       url('../font/fontello.woff?23060348') format('woff'),
-       url('../font/fontello.ttf?23060348') format('truetype'),
-       url('../font/fontello.svg?23060348#fontello') format('svg');
+  src: url('../font/fontello.eot?20888173');
+  src: url('../font/fontello.eot?20888173#iefix') format('embedded-opentype'),
+       url('../font/fontello.woff2?20888173') format('woff2'),
+       url('../font/fontello.woff?20888173') format('woff'),
+       url('../font/fontello.ttf?20888173') format('truetype'),
+       url('../font/fontello.svg?20888173#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?23060348#fontello') format('svg');
+    src: url('../font/fontello.svg?20888173#fontello') format('svg');
   }
 }
 */

static/font/demo.html

@@ -229,11 +229,11 @@ body {
 }
 @font-face {
       font-family: 'fontello';
-      src: url('./font/fontello.eot?40419282');
-      src: url('./font/fontello.eot?40419282#iefix') format('embedded-opentype'),
-           url('./font/fontello.woff?40419282') format('woff'),
-           url('./font/fontello.ttf?40419282') format('truetype'),
-           url('./font/fontello.svg?40419282#fontello') format('svg');
+      src: url('./font/fontello.eot?93986776');
+      src: url('./font/fontello.eot?93986776#iefix') format('embedded-opentype'),
+           url('./font/fontello.woff?93986776') format('woff'),
+           url('./font/fontello.ttf?93986776') format('truetype'),
+           url('./font/fontello.svg?93986776#fontello') format('svg');
       font-weight: normal;
       font-style: normal;
     }