Merge branch 'alex'

[MERGE JQUERY UPGRADE]

templates/corpus.html

@@ -114,7 +114,7 @@
 </div>
 
 
-<script src="{% static "js/charts/jquery-latest.js" %}"></script>
+<script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
 <script src="{% static "js/charts/bootstrap.min.js" %}"></script>
 
 

templates/home.html

@@ -6,7 +6,8 @@
 <link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
 <link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}">
 
-<script src="{% static "js/jquery/jquery-1.9.1.min.js"%}"></script>
+<script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
+
 {% endblock %}
 
 
@@ -23,7 +24,7 @@
 				<div class="row">
 						<div class="content">
 						<center>
-						<h2>Tutoral in Video</h2>
+						<h2>Introduction Video</h2>
 						<video width="320" height="240" controls>
 						<source src="movie.mp4" type="video/mp4">
 						<source src="movie.ogg" type="video/ogg">

templates/project.html

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