Merge branch 'develop' into brewbakers

diff --cc setup/databaseScripts/drop_database_V1.1.28.sql
index 0000000,5c742da..4977c6c
mode 000000,100644..100644
--- /dev/null
--- 2/setup/databaseScripts/drop_database_V1.1.28.sql
+++ b/setup/databaseScripts/drop_database_V1.1.28.sql
@@@ -1,0 -1,27 +1,28 @@@
+ -- Gaslight Media Members Database
+ -- File Created: 12/09/14 15:27:15
+ -- Database Version: 1.1.23
+ -- Database Deletion Script
+ -- Note: Tables with DELETE CASCADE must appear before referenced table
+ 
+ DROP TABLE IF EXISTS
+     {prefix}amenities,
+     {prefix}amenity_ref,
+     {prefix}category_member_info,
+     {prefix}cities,
+     {prefix}clickthrough_stats,
+     {prefix}images,
+     {prefix}files,
+     {prefix}members,
+     {prefix}member_detail_stats,
+     {prefix}member_info,
+     {prefix}member_type,
+     {prefix}regions,
++    {prefix}counties,
+     {prefix}settings_general,
+     {prefix}settings_terms,
+     {prefix}settings_theme,
+     {prefix}categories,
+     {prefix}amenity_groups,
+     {prefix}grouped_amenities
+ ;
+