Merge branch 'alex' into merge

[FIX JQ in html]

templates/home.html

@@ -6,7 +6,6 @@
 <link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
 <link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}">
 
-<script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
 
 {% endblock %}
 

templates/menu.html

@@ -62,7 +62,6 @@
 
 <!-- 
 
-<script src="{% static "js/jquery/jquery-1.9.1.min.js"%}"></script> 
 <script src="{% static "js/easy/jquery.easypiechart.js"%}"></script>
 
 <script type="text/javascript">
@@ -77,6 +76,7 @@ $(function() {
 
 -->
 
+<script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
 <script src="{% static "js/bootstrap/bootstrap.min.js" %}"></script>
 
 <script>$(function () { $("[data-toggle='popover']").popover({

templates/project.html

@@ -7,8 +7,8 @@
 
 <link rel="stylesheet" type="text/css" href="{% static "css/morris.css" %}">
 <link rel="stylesheet" type="text/css" href="{% static "css/jquery.easy-pie-chart.css"%}">
-
 <script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
+
 <script src="{% static "js/raphael-min.js"%}"></script>
 <script src="{% static "js/morris.min.js"%}"></script>
 

templates/projects.html

@@ -5,7 +5,6 @@
 {% load staticfiles %}
 <link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
 
-<script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
 {% endblock %}