Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

Templates/DefaultProject/Template/Code/gem.json

@@ -1,8 +1,9 @@
 {
     "gem_name": "${Name}",
-    "origin": "The primary repo for ${Name} goes here: i.e. http://www.mydomain.com",
-    "license": "What license ${Name} uses goes here: i.e. https://opensource.org/licenses/MIT",
     "display_name": "${Name}",
+    "license": "What license ${Name} uses goes here: i.e. https://opensource.org/licenses/MIT",
+    "origin": "The primary repo for ${Name} goes here: i.e. http://www.mydomain.com",
+    "type": "Code",
     "summary": "A short description of ${Name}.",
     "canonical_tags": [
         "Gem"
@@ -10,5 +11,6 @@
     "user_tags": [
         "${Name}"
     ],
-    "icon_path": "preview.png"
+    "icon_path": "preview.png",
+    "requirements": ""
 }