Merge branch 'master' of https://gitlab.eng.unimelb.edu.au/973651/comp90082-eportfolio-team03

.idea/artifacts/ePortfolio.xml

+<component name="ArtifactManager">
+  <artifact type="war" name="ePortfolio">
+    <output-path>$PROJECT_DIR$/out/artifacts/ePortfolio</output-path>
+    <root id="archive" name="ePortfolio.war">
+      <element id="artifact" artifact-name="ePortfolio:war exploded" />
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
+      </element>
+    </root>
+  </artifact>
+</component>
\ No newline at end of file

web/js/Award/awards_admin.js

@@ -157,10 +157,6 @@ function addAward(){
             } else{
                 alert("Insert Failed");
             }
-        },
-        error : function(msg) {
-            alert("Add Award Failed");
-            console.log(msg)
         }
     });
 }