Move includes to right place.

cms/templates/base.html

@@ -22,7 +22,6 @@
     <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/sets/wiki/style.css')}" />
     <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-symbolicons-block.css')}" />
     <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-standard.css')}" />
-    <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/html5-input-polyfills/number-polyfill.css')}" />
 
     <%include file="widgets/segment-io.html" />
 
@@ -46,7 +45,6 @@
     <script type="text/javascript" src="${static.url('js/vendor/markitup/sets/wiki/set.js')}"></script>
     <script src="${static.url('js/vendor/symbolset.ss-standard.js')}"></script>
     <script src="${static.url('js/vendor/symbolset.ss-symbolicons.js')}"></script>
-    <script src="${static.url('js/vendor/html5-input-polyfills/number-polyfill.js')}"></script>
 
     <%static:js group='main'/>
     <%static:js group='module-js'/>
@@ -60,11 +58,6 @@
     <script type="text/javascript" src="${static.url('js/vendor/CodeMirror/css.js')}"></script>
     <script type="text/javascript" src="//www.youtube.com/player_api"></script>
 
-    <!--TODO: not the right place-->
-    <script type="text/javascript" src="${static.url('js/models/metadata_model.js')}"></script>
-    <script type="text/javascript" src="${static.url('js/views/metadata_editor_view.js')}"></script>
-    <script type="text/javascript" src="${static.url('js/template_loader.js')}"></script>
-
     <script src="${static.url('js/models/feedback.js')}"></script>
     <script src="${static.url('js/views/feedback.js')}"></script>
 

cms/templates/component.html

 <%! from django.utils.translation import ugettext as _ %>
+<%namespace name='static' file='static_content.html'/>
+
+<script type="text/javascript" src="${static.url('js/models/metadata_model.js')}"></script>
+<script type="text/javascript" src="${static.url('js/views/metadata_editor_view.js')}"></script>
+<script type="text/javascript" src="${static.url('js/template_loader.js')}"></script>
+<script src="${static.url('js/vendor/html5-input-polyfills/number-polyfill.js')}"></script>
+<link rel="stylesheet" type="text/css" href="${static.url('css/vendor/html5-input-polyfills/number-polyfill.css')}" />
 
 <div class="wrapper wrapper-component-editor">
 	<div class="component-editor">