Merge branch 'release' to upgrade MDM to 0.12.1

Author: bturner-r7

Gemfile

@@ -15,7 +15,7 @@ group :db do
 	# Needed for Msf::DbManager
 	gem 'activerecord'
 	# Database models shared between framework and Pro.
-	gem 'metasploit_data_models', '~> 0.12.0'
+	gem 'metasploit_data_models', '~> 0.12.1'
 	# Needed for module caching in Mdm::ModuleDetails
 	gem 'pg', '>= 0.11'
 end

Gemfile.lock

@@ -23,7 +23,7 @@ GEM
     i18n (0.6.1)
     json (1.7.7)
     metaclass (0.0.1)
-    metasploit_data_models (0.12.0)
+    metasploit_data_models (0.12.1)
       activerecord (>= 3.2.13)
       activesupport
       pg
@@ -65,7 +65,7 @@ DEPENDENCIES
   database_cleaner
   factory_girl (>= 4.1.0)
   json
-  metasploit_data_models (~> 0.12.0)
+  metasploit_data_models (~> 0.12.1)
   msgpack
   nokogiri
   pcaprub