Merge branch 'develop' of github.com:csssuf/conditional into develop

Author: mbillow

conditional/templates/dashboard.html

@@ -111,7 +111,7 @@ <h3 class="panel-title">Freshman Evaluations
 
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h3 class="panel-title">Spring Evaluations
+                    <h3 class="panel-title">Membership Evaluations
                         {% if spring['status'] == "Passed" %}
                         <span class="pull-right"><span class="glyphicon glyphicon-ok-sign green"></span> Passed</span>
                         {% elif spring['status'] == "Failed" %}

conditional/templates/nav.html

@@ -17,7 +17,7 @@
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-stats"></span> Evals <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li><a href="/intro_evals"><span class="glyphicon glyphicon-star"></span> Introductory Evaluations</a></li>
-                        <li><a href="/spring_evals"><span class="glyphicon glyphicon-tree-deciduous"></span> Spring Evaluations</a></li>
+                        <li><a href="/spring_evals"><span class="glyphicon glyphicon-tree-deciduous"></span> Membership Evaluations</a></li>
                         <li><a href="/conditionals"><span class="glyphicon glyphicon-exclamation-sign"></span> Current Conditionals</a></li>
                     </ul>
                 </li>
@@ -51,8 +51,8 @@
                         <li><a href="/manage"><span class="glyphicon glyphicon-user"></span> Member Management</a></li>
                         {% if is_eval_director %}
 
-                        <li><a href="/slideshow/intro"><span class="glyphicon glyphicon-eye-open"></span> Fall Presentation</a></li>
-                        <li><a href="/slideshow/spring"><span class="glyphicon glyphicon-eye-open"></span> Spring Presentation</a></li>
+                        <li><a href="/slideshow/intro"><span class="glyphicon glyphicon-eye-open"></span> Introductory Evaluations Presentation</a></li>
+                        <li><a href="/slideshow/spring"><span class="glyphicon glyphicon-eye-open"></span> Membership Evaluations Presentation</a></li>
 
                         {% endif %}
                     </ul>