Merge branch 'vdb_intergration'

Conflicts:
	lib/common/models/vulnerability.rb
	spec/lib/common/models/vulnerability_spec.rb
	spec/lib/common/models/wp_item_spec.rb
	spec/lib/common/models/wp_plugin_spec.rb
	spec/lib/common/models/wp_theme_spec.rb
	spec/lib/common/models/wp_version_spec.rb

lib/common/models/vulnerability.rb

@@ -43,7 +43,7 @@ class Vulnerability
   def self.load_from_json_item(json_item)
     references = {}
 
-    %w(url cve secunia osvdb metasploit exploitdb).each do |key|
+    %w(id url cve secunia osvdb metasploit exploitdb).each do |key|
       if json_item[key]
         json_item[key]  = [json_item[key]] if json_item[key].class != Array
         references[key] = json_item[key]

lib/common/models/vulnerability/urls.rb

@@ -22,12 +22,15 @@ class Vulnerability
     end
 
     def url_secunia(id)
-      "http://secunia.com/advisories/#{id}"
+      "https://secunia.com/advisories/#{id}"
     end
 
     def url_exploitdb(id)
       "http://www.exploit-db.com/exploits/#{id}/"
     end
 
+    def url_id(id)
+      "https://CHANGE_ME_BEFORE_MERGE/vulnerability/#{id}"
+    end
   end
 end