Merge branch 'master' of github.com:srct/advisor

advisor/templates/login.html

@@ -17,7 +17,7 @@ Login | YourSchool Advisor
 <div class="row">
   <div class="col-lg-6 col-lg-offset-3">
     <div class="well">
-      {% if form.error %}
+      {% if form.errors %}
       <div class="row">
         <div class="col-md-12">
 	  <div class="alert alert-danger alert-dismissable">