Merge pull request #523 from aaronweaver/master

Updating documentation

Author: aaronweaver

docs/upgrading.rst

@@ -152,5 +152,4 @@ Upgrading to 1.2.4 requires:
 
 1.  ./manage.py makemigrations
     ./manage.py migrate
-    ./manage.py loaddata dojo/fixtures/test_type.json
     ./manage.py loaddata dojo/fixtures/objects_review.json

dojo/fixtures/test_type.json

@@ -78,7 +78,7 @@
   },
   {
     "fields": {
-      "name": "Checkmarx"
+      "name": "Checkmarx Scan"
     },
     "model": "dojo.test_type",
     "pk": 12