Merge remote-tracking branch 'origin/move-js-libs'

cps/static/css/main.css

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../fonts/fontello.eot?60518104');
-  src: url('../fonts/fontello.eot?60518104#iefix') format('embedded-opentype'),
-       url('../fonts/fontello.woff?60518104') format('woff'),
-       url('../fonts/fontello.ttf?60518104') format('truetype'),
-       url('../fonts/fontello.svg?60518104#fontello') format('svg');
+  src: url('fonts/fontello.eot?60518104');
+  src: url('fonts/fontello.eot?60518104#iefix') format('embedded-opentype'),
+       url('fonts/fontello.woff?60518104') format('woff'),
+       url('fonts/fontello.ttf?60518104') format('truetype'),
+       url('fonts/fontello.svg?60518104#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }

cps/static/css/style.css

@@ -2,7 +2,7 @@
   font-family: 'Grand Hotel';
   font-style: normal;
   font-weight: 400;
-  src: local('Grand Hotel'), local('GrandHotel-Regular'), url("../fonts/GrandHotel-Regular.ttf") format('truetype');
+  src: local('Grand Hotel'), local('GrandHotel-Regular'), url("fonts/GrandHotel-Regular.ttf") format('truetype');
 }
 
 body{background:#f2f2f2}body h2{font-weight:normal;color:#444}