Merge branch 'master' into bromley

Conflicts: bin/send-reports conf/crontab.ugly conf/general.yml-example db/schema.sql perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/App/Controller/Report/New.pm perllib/FixMyStreet/DB/Result/Comment.pm perllib/FixMyStreet/DB/Result/Open311conf.pm perllib/FixMyStreet/DB/Result/Problem.pm perllib/FixMyStreet/DB/Result/User.pm templates/web/default/js/validation_strings.html templates/web/fixmystreet/auth/sign_out.html templates/web/fixmystreet/report/new/councils_text_all.html web/cobrands/fixmystreet/_base.scss
author: Matthew Somerville <matthew@mysociety.org> 2012-05-16 14:30:30 +0100
committer: Matthew Somerville <matthew@mysociety.org> 2012-05-16 14:30:30 +0100
commit: d9f3bd47a94116871893f0417e7c836400bb04eb (patch)
tree: 1c140a6cb9ea3fd60dbf1532d2cb0bcfdaa703ad
parent: 1ba0a33c9fa19f2fa46f16678785d1c90ed33eb0 (diff)
parent: 194173589eed229567646cedfc0e32621d18f1e7 (diff)
206 files changed, 6383 insertions, 2202 deletions
diff --git a/bin/kasabi b/bin/kasabi
index 986032084..5b99ba4ff 100755
--- a/bin/kasabi
+++ b/bin/kasabi
@@ -27,9 +27,16 @@ cursor = db.cursor(cursor_factory=psycopg2.extras.RealDictCursor)
 report_cursor = db.cursor(cursor_factory=psycopg2.extras.RealDictCursor)
 
 def main():
-    # Fetch reports that have changed recently
-    #response, data = dataset.select('select (max(?lastupdate) as ?max) where { ?report <http://data.kasabi.com/dataset/fixmystreet/def/lastUpdate> ?lastupdate }')
-    #max_lastUpdate = data[1][0]['max']
+
+    # Check the status of our dataset
+    response, status = dataset.status()
+    if response.status not in range(200, 300) or status['storageMode'] == 'read-only':
+        # We can't import anything, so let's not bother
+        sys.exit()
+
+    # Fetch reports that have changed since last update in dataset
+    response, data = dataset.select('select (max(?lastupdate) as ?max) where { ?report <http://data.kasabi.com/dataset/fixmystreet/def/lastUpdate> ?lastupdate }')
+    max_lastUpdate = data[1][0]['max']
     query = """
         SELECT id, latitude, longitude, used_map, council,
             category, title, detail, (photo IS NOT NULL) as photo,
@@ -40,10 +47,7 @@ def main():
     if len(sys.argv) > 1 and sys.argv[1].isdigit():
         cursor.execute("%s AND id=%%s" % query, (sys.argv[1],))
     else:
-        last_hour = datetime.datetime.now().replace(minute=0, second=0, microsecond=0) - datetime.timedelta(hours=1)
-        cursor.execute("%s AND date_trunc('hour', lastupdate) = %%s" % query, (last_hour,))
-#            AND lastupdate > %s
-#    """, (max_lastUpdate,))
+        cursor.execute("%s AND lastupdate > %%s ORDER BY lastupdate" % query, (str(max_lastUpdate),))
 
     for report in cursor:
         changeset = FixMyStreetChangeSet(dataset)
diff --git a/bin/problem-creation-graph b/bin/problem-creation-graph
index 4bba1cdb8..6692ae724 100755
--- a/bin/problem-creation-graph
+++ b/bin/problem-creation-graph
@@ -104,6 +104,6 @@ END
 #echo "gpscript $GPSCRIPT"
 
 export GDFONTPATH=/usr/share/fonts/truetype/ttf-bitstream-vera
-gnuplot < $GPSCRIPT > fixmystreet/web/bci-live-creation$EXTENSION
+gnuplot < $GPSCRIPT > fixmystreet/web/bci-live-creation$EXTENSION 2>/dev/null
 
 
diff --git a/bin/problems-filed-graph b/bin/problems-filed-graph
index dbac35639..8addacd62 100755
--- a/bin/problems-filed-graph
+++ b/bin/problems-filed-graph
@@ -57,5 +57,5 @@ END
 #echo "gpscript $GPSCRIPT"
 
 export GDFONTPATH=/usr/share/fonts/truetype/ttf-bitstream-vera
-gnuplot < $GPSCRIPT > fixmystreet/web/bci-live-line$EXTENSION
+gnuplot < $GPSCRIPT > fixmystreet/web/bci-live-line$EXTENSION 2>/dev/null
 
diff --git a/carton.lock b/carton.lock
index 1f73bfad4..cd7b0e70b 100644
--- a/carton.lock
+++ b/carton.lock
@@ -3336,6 +3336,114 @@
          },
          "version" : "1.4"
       },
+      "Class::Std" : {
+         "dist" : "Class-Std-0.011",
+         "module" : "Class::Std",
+         "mymeta" : {
+            "abstract" : "Support for creating standard \"inside-out\" classes",
+            "author" : [
+               "Damian Conway <DCONWAY@cpan.org>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "unknown"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "Class-Std",
+            "prereqs" : {
+               "runtime" : {
+                  "requires" : {
+                     "Data::Dumper" : 0,
+                     "Scalar::Util" : 0,
+                     "Test::More" : 0
+                  }
+               }
+            },
+            "release_status" : "stable",
+            "version" : "0.011"
+         },
+         "name" : "Class::Std",
+         "pathname" : "D/DC/DCONWAY/Class-Std-0.011.tar.gz",
+         "provides" : {
+            "Class::Std" : {
+               "file" : "Class/Std.pm",
+               "version" : "0.011"
+            },
+            "Class::Std::SCR" : {
+               "file" : "Class/Std.pm"
+            }
+         },
+         "version" : "0.011"
+      },
+      "Class::Std::Fast" : {
+         "dist" : "Class-Std-Fast-v0.0.8",
+         "module" : "Class::Std::Fast::Storable",
+         "mymeta" : {
+            "abstract" : "faster but less secure than Class::Std",
+            "author" : [
+               "Andreas 'ac0v' Specht - ACID@cpan.org"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "perl_5"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "Class-Std-Fast",
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "Test::More" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {
+                     "Class::Std" : "v0.0.8",
+                     "Data::Dumper" : 0,
+                     "Scalar::Util" : 0,
+                     "version" : 0
+                  }
+               }
+            },
+            "provides" : {
+               "Class::Std::Fast" : {
+                  "file" : "lib/Class/Std/Fast.pm",
+                  "version" : "v0.0.8"
+               },
+               "Class::Std::Fast::Storable" : {
+                  "file" : "lib/Class/Std/Fast/Storable.pm",
+                  "version" : "v0.0.8"
+               }
+            },
+            "release_status" : "stable",
+            "resources" : {
+               "license" : [
+                  "http://dev.perl.org/licenses/"
+               ]
+            },
+            "version" : "v0.0.8"
+         },
+         "name" : "Class::Std::Fast",
+         "pathname" : "A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz",
+         "provides" : {
+            "Class::Std::Fast" : {
+               "file" : "Class/Std/Fast.pm",
+               "version" : "v0.0.8"
+            },
+            "Class::Std::Fast::Storable" : {
+               "file" : "Class/Std/Fast/Storable.pm",
+               "version" : "v0.0.8"
+            }
+         },
+         "version" : "v0.0.8"
+      },
       "Class::Unload" : {
          "dist" : "Class-Unload-0.07",
          "module" : "Class::Unload",
@@ -5015,6 +5123,311 @@
          },
          "version" : "0.00011"
       },
+      "DBIx::Class::IntrospectableM2M" : {
+         "dist" : "DBIx-Class-IntrospectableM2M-0.001001",
+         "module" : "DBIx::Class::IntrospectableM2M",
+         "mymeta" : {
+            "abstract" : "Introspect many-to-many relationships",
+            "author" : [
+               "Guillermo Roditi (groditi) <groditi@cpan.org>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "Module::Install version 0.76, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "perl_5"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "DBIx-Class-IntrospectableM2M",
+            "no_index" : {
+               "directory" : [
+                  "inc",
+                  "t"
+               ]
+            },
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {
+                     "DBIx::Class" : 0,
+                     "ExtUtils::MakeMaker" : "6.62",
+                     "Test::More" : 0
+                  }
+               }
+            },
+            "release_status" : "stable",
+            "resources" : {
+               "license" : [
+                  "http://dev.perl.org/licenses/"
+               ]
+            },
+            "version" : "0.001001"
+         },
+         "name" : "DBIx::Class::IntrospectableM2M",
+         "pathname" : "G/GR/GRODITI/DBIx-Class-IntrospectableM2M-0.001001.tar.gz",
+         "provides" : {
+            "DBIx::Class::IntrospectableM2M" : {
+               "file" : "DBIx/Class/IntrospectableM2M.pm",
+               "version" : "0.001001"
+            }
+         },
+         "version" : "0.001001"
+      },
+      "DBIx::Class::Schema::Loader" : {
+         "dist" : "DBIx-Class-Schema-Loader-0.07017",
+         "module" : "DBIx::Class::Schema::Loader",
+         "mymeta" : {
+            "abstract" : "Create a DBIx::Class::Schema based on a database",
+            "author" : [
+               "blblack: Brandon Black <blblack@gmail.com>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "Module::Install version 1.04, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "perl_5"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "DBIx-Class-Schema-Loader",
+            "no_index" : {
+               "directory" : [
+                  "inc",
+                  "t"
+               ]
+            },
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "DBD::SQLite" : "1.29",
+                     "DBI" : "1.56",
+                     "DBIx::Class::IntrospectableM2M" : 0,
+                     "ExtUtils::MakeMaker" : "6.62",
+                     "File::Copy" : 0,
+                     "File::Path" : "2.07",
+                     "File::Temp" : "0.16",
+                     "IPC::Open3" : 0,
+                     "Test::Exception" : 0,
+                     "Test::More" : "0.94",
+                     "Test::Warn" : "0.21"
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : "6.62"
+                  }
+               },
+               "runtime" : {
+                  "requires" : {
+                     "Carp::Clan" : 0,
+                     "Class::Accessor::Grouped" : "0.10002",
+                     "Class::C3::Componentised" : "1.0008",
+                     "Class::Inspector" : 0,
+                     "Class::Unload" : 0,
+                     "DBD::SQLite" : "1.29",
+                     "DBI" : "1.56",
+                     "DBIx::Class" : "0.08127",
+                     "DBIx::Class::IntrospectableM2M" : 0,
+                     "Data::Dump" : "1.06",
+                     "Digest::MD5" : "2.36",
+                     "Exporter" : "5.63",
+                     "File::Copy" : 0,
+                     "File::Path" : "2.07",
+                     "File::Spec" : 0,
+                     "File::Temp" : "0.16",
+                     "IPC::Open3" : 0,
+                     "Lingua::EN::Inflect::Number" : "1.1",
+                     "Lingua::EN::Inflect::Phrase" : "0.02",
+                     "Lingua::EN::Tagger" : 0,
+                     "List::MoreUtils" : 0,
+                     "MRO::Compat" : "0.09",
+                     "Scalar::Util" : 0,
+                     "Scope::Guard" : 0,
+                     "String::CamelCase" : "0.02",
+                     "String::ToIdentifier::EN" : "0.05",
+                     "Sub::Name" : 0,
+                     "Task::Weaken" : 0,
+                     "Test::Exception" : 0,
+                     "Test::More" : "0.94",
+                     "Test::Warn" : "0.21",
+                     "Try::Tiny" : 0,
+                     "namespace::clean" : "0.20",
+                     "perl" : "5.008001"
+                  }
+               }
+            },
+            "release_status" : "stable",
+            "resources" : {
+               "license" : [
+                  "http://dev.perl.org/licenses/"
+               ],
+               "repository" : {
+                  "type" : "git",
+                  "url" : "git://git.shadowcat.co.uk/dbsrgits/DBIx-Class-Schema-Loader.git"
+               },
+               "x_IRC" : "irc://irc.perl.org/#dbix-class",
+               "x_MailingList" : "http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class"
+            },
+            "version" : "0.07017"
+         },
+         "name" : "DBIx::Class::Schema::Loader",
+         "pathname" : "R/RK/RKITOVER/DBIx-Class-Schema-Loader-0.07017.tar.gz",
+         "provides" : {
+            "DBIx::Class::Schema::Loader" : {
+               "file" : "DBIx/Class/Schema/Loader.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::Base" : {
+               "file" : "DBIx/Class/Schema/Loader/Base.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::ADO" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/ADO.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::ADO::MS_Jet" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::ADO::Microsoft_SQL_Server" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::Component::QuotedDefault" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::DB2" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/DB2.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::Firebird" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/Firebird.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::Informix" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/Informix.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::InterBase" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/InterBase.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::MSSQL" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/MSSQL.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::ODBC" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/ODBC.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::ODBC::ACCESS" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::ODBC::Firebird" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::ODBC::Microsoft_SQL_Server" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::ODBC::SQL_Anywhere" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::Oracle" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/Oracle.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::Pg" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/Pg.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::SQLAnywhere" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::SQLite" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/SQLite.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::Sybase" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/Sybase.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::Sybase::Common" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::Sybase::Microsoft_SQL_Server" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::Writing" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/Writing.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBI::mysql" : {
+               "file" : "DBIx/Class/Schema/Loader/DBI/mysql.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::DBObject" : {
+               "file" : "DBIx/Class/Schema/Loader/DBObject.pm"
+            },
+            "DBIx::Class::Schema::Loader::DBObject::Informix" : {
+               "file" : "DBIx/Class/Schema/Loader/DBObject/Informix.pm"
+            },
+            "DBIx::Class::Schema::Loader::DBObject::Sybase" : {
+               "file" : "DBIx/Class/Schema/Loader/DBObject/Sybase.pm"
+            },
+            "DBIx::Class::Schema::Loader::Optional::Dependencies" : {
+               "file" : "DBIx/Class/Schema/Loader/Optional/Dependencies.pm"
+            },
+            "DBIx::Class::Schema::Loader::RelBuilder" : {
+               "file" : "DBIx/Class/Schema/Loader/RelBuilder.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_040" : {
+               "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_05" : {
+               "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_06" : {
+               "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_07" : {
+               "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_07.pm",
+               "version" : "0.07017"
+            },
+            "DBIx::Class::Schema::Loader::Table" : {
+               "file" : "DBIx/Class/Schema/Loader/Table.pm"
+            },
+            "DBIx::Class::Schema::Loader::Table::Informix" : {
+               "file" : "DBIx/Class/Schema/Loader/Table/Informix.pm"
+            },
+            "DBIx::Class::Schema::Loader::Table::Sybase" : {
+               "file" : "DBIx/Class/Schema/Loader/Table/Sybase.pm"
+            }
+         },
+         "version" : "0.07017"
+      },
       "Data::Compare" : {
          "dist" : "Data-Compare-1.22",
          "module" : "Data::Compare",
@@ -15849,24 +16262,63 @@
          },
          "version" : "6.01"
       },
-      "List::MoreUtils" : {
-         "dist" : "List-MoreUtils-0.33",
-         "module" : "List::MoreUtils",
+      "Lingua::EN::Inflect" : {
+         "dist" : "Lingua-EN-Inflect-1.893",
+         "module" : "Lingua::EN::Inflect",
          "mymeta" : {
-            "abstract" : "Provide the stuff missing in List::Util",
+            "abstract" : "Convert singular to plural. Select \"a\" or \"an\".",
             "author" : [
-               "Tassilo von Parseval <tassilo.von.parseval@rwth-aachen.de>"
+               "Damian Conway <DCONWAY@CPAN.org>"
             ],
             "dynamic_config" : 0,
-            "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150",
+            "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150",
             "license" : [
-               "perl_5"
+               "unknown"
             ],
             "meta-spec" : {
                "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
                "version" : "2"
             },
-            "name" : "List-MoreUtils",
+            "name" : "Lingua-EN-Inflect",
+            "prereqs" : {
+               "runtime" : {
+                  "requires" : {
+                     "Test::More" : 0,
+                     "version" : 0
+                  }
+               }
+            },
+            "release_status" : "stable",
+            "version" : "1.893"
+         },
+         "name" : "Lingua::EN::Inflect",
+         "pathname" : "D/DC/DCONWAY/Lingua-EN-Inflect-1.893.tar.gz",
+         "provides" : {
+            "Lingua::EN::Inflect" : {
+               "file" : "Lingua/EN/Inflect.pm",
+               "version" : "1.893"
+            }
+         },
+         "version" : "1.893"
+      },
+      "Lingua::EN::Inflect::Number" : {
+         "dist" : "Lingua-EN-Inflect-Number-1.1",
+         "module" : "Lingua::EN::Inflect::Number",
+         "mymeta" : {
+            "abstract" : "unknown",
+            "author" : [
+               "unknown"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "unknown"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "Lingua-EN-Inflect-Number",
             "no_index" : {
                "directory" : [
                   "t",
@@ -15876,45 +16328,44 @@
             "prereqs" : {
                "build" : {
                   "requires" : {
-                     "Test::More" : "0.42"
+                     "ExtUtils::MakeMaker" : 0
                   }
                },
                "configure" : {
                   "requires" : {
-                     "ExtUtils::CBuilder" : "0.27",
-                     "ExtUtils::MakeMaker" : "6.52"
+                     "ExtUtils::MakeMaker" : 0
                   }
                },
                "runtime" : {
                   "requires" : {
-                     "Test::More" : "0.82",
-                     "perl" : "5.00503"
+                     "Lingua::EN::Inflect" : 0
                   }
                }
             },
             "release_status" : "stable",
-            "version" : "0.33"
+            "version" : "1.1"
          },
-         "name" : "List::MoreUtils",
-         "pathname" : "A/AD/ADAMK/List-MoreUtils-0.33.tar.gz",
+         "name" : "Lingua::EN::Inflect::Number",
+         "pathname" : "S/SI/SIMON/Lingua-EN-Inflect-Number-1.1.tar.gz",
          "provides" : {
-            "List::MoreUtils" : {
-               "file" : "List/MoreUtils.pm",
-               "version" : "0.33"
+            "Lingua::EN::Inflect::Number" : {
+               "file" : "Lingua/EN/Inflect/Number.pm",
+               "version" : "1.1"
             }
          },
-         "version" : "0.33"
+         "version" : "1.1"
       },
-      "Locale::Maketext" : {
-         "dist" : "Locale-Maketext-1.22",
-         "module" : "Locale::Maketext",
+      "Lingua::EN::Inflect::Phrase" : {
+         "dist" : "Lingua-EN-Inflect-Phrase-0.12",
+         "module" : "Lingua::EN::Inflect::Phrase",
          "mymeta" : {
-            "abstract" : "framework for localization",
+            "abstract" : "Inflect short English Phrases",
             "author" : [
-               "unknown"
+               "Rafael Kitover <rkitover@cpan.org>",
+               "Rafael Kitover <rkitover@cpan.org>"
             ],
             "dynamic_config" : 0,
-            "generated_by" : "ExtUtils::MakeMaker version 6.58, CPAN::Meta::Converter version 2.110930001, CPAN::Meta::Converter version 2.112150",
+            "generated_by" : "Module::Install version 1.04, CPAN::Meta::Converter version 2.112150",
             "license" : [
                "perl_5"
             ],
@@ -15922,204 +16373,669 @@
                "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
                "version" : "2"
             },
-            "name" : "Locale-Maketext",
+            "name" : "Lingua-EN-Inflect-Phrase",
             "no_index" : {
                "directory" : [
-                  "t",
-                  "inc"
+                  "inc",
+                  "t"
                ]
             },
             "prereqs" : {
                "build" : {
                   "requires" : {
-                     "ExtUtils::MakeMaker" : 0
+                     "ExtUtils::MakeMaker" : "6.36",
+                     "Test::More" : "0.94"
                   }
                },
                "configure" : {
                   "requires" : {
-                     "ExtUtils::MakeMaker" : 0
+                     "ExtUtils::MakeMaker" : "6.36"
                   }
                },
                "runtime" : {
                   "requires" : {
-                     "I18N::LangTags" : "0.31",
-                     "I18N::LangTags::Detect" : 0,
-                     "Test::More" : 0
+                     "Exporter" : "5.63",
+                     "Lingua::EN::Inflect" : "1.891",
+                     "Lingua::EN::Inflect::Number" : "1.1",
+                     "Lingua::EN::Tagger" : "0.15",
+                     "Test::More" : "0.94"
                   }
                }
             },
+            "provides" : {
+               "Lingua::EN::Inflect::Phrase" : {
+                  "file" : "lib/Lingua/EN/Inflect/Phrase.pm",
+                  "version" : "0.12"
+               }
+            },
             "release_status" : "stable",
             "resources" : {
-               "bugtracker" : {
-                  "web" : "http://rt.perl.org/perlbug/"
-               },
                "license" : [
                   "http://dev.perl.org/licenses/"
                ],
                "repository" : {
-                  "url" : "http://perl5.git.perl.org/perl.git/tree/HEAD:/dist/Locale-Maketext"
-               },
-               "x_MailingList" : "http://lists.perl.org/list/perl5-porters.html"
+                  "type" : "git",
+                  "url" : "git://github.com/rkitover/lingua-en-inflect-phrase.git"
+               }
             },
-            "version" : "1.22"
+            "version" : "0.12"
          },
-         "name" : "Locale::Maketext",
-         "pathname" : "T/TO/TODDR/Locale-Maketext-1.22.tar.gz",
+         "name" : "Lingua::EN::Inflect::Phrase",
+         "pathname" : "R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.12.tar.gz",
          "provides" : {
-            "Locale::Maketext" : {
-               "file" : "Locale/Maketext.pm",
-               "version" : "1.22"
+            "Lingua::EN::Inflect::Phrase" : {
+               "file" : "Lingua/EN/Inflect/Phrase.pm",
+               "version" : "0.12"
+            }
+         },
+         "version" : "0.12"
+      },
+      "Lingua::EN::Tagger" : {
+         "dist" : "Lingua-EN-Tagger-0.16",
+         "module" : "Lingua::EN::Tagger",
+         "mymeta" : {
+            "abstract" : "unknown",
+            "author" : [
+               "Maciej Ceglowski and Aaron Coburn <maciej@ceglowski.com>, <aaron@coburncuadrado.com>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "unknown"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
             },
-            "Locale::Maketext::Guts" : {
-               "file" : "Locale/Maketext/Guts.pm",
-               "version" : "1.20"
+            "name" : "Lingua-EN-Tagger",
+            "no_index" : {
+               "directory" : [
+                  "t",
+                  "inc"
+               ]
             },
-            "Locale::Maketext::GutsLoader" : {
-               "file" : "Locale/Maketext/GutsLoader.pm",
-               "version" : "1.20"
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {
+                     "File::Spec" : "0.84",
+                     "HTML::Parser" : "3.45",
+                     "Lingua::Stem" : "0.81",
+                     "Memoize" : "1.01",
+                     "Memoize::ExpireLRU" : "0.55",
+                     "Storable" : "2.10"
+                  }
+               }
+            },
+            "release_status" : "stable",
+            "version" : "0.16"
+         },
+         "name" : "Lingua::EN::Tagger",
+         "pathname" : "A/AC/ACOBURN/Lingua-EN-Tagger-0.16.tar.gz",
+         "provides" : {
+            "Lingua::EN::Tagger" : {
+               "file" : "Lingua/EN/Tagger.pm",
+               "version" : "0.16"
             }
          },
-         "version" : "1.22"
+         "version" : "0.16"
       },
-      "Locale::Maketext::Lexicon" : {
-         "dist" : "Locale-Maketext-Lexicon-0.91",
-         "module" : "Locale::Maketext::Lexicon",
+      "Lingua::PT::Stemmer" : {
+         "dist" : "Lingua-PT-Stemmer-0.01",
+         "module" : "Lingua::PT::Stemmer",
          "mymeta" : {
-            "abstract" : "Use other catalog formats in Maketext",
+            "abstract" : "Portuguese language stemming",
             "author" : [
-               "Audrey Tang <cpan@audreyt.org>"
+               "xern <xern@cpan.org>"
             ],
             "dynamic_config" : 0,
-            "generated_by" : "Module::Install version 1.01, CPAN::Meta::Converter version 2.112150",
+            "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150",
             "license" : [
-               "mit"
+               "unknown"
             ],
             "meta-spec" : {
                "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
                "version" : "2"
             },
-            "name" : "Locale-Maketext-Lexicon",
+            "name" : "Lingua-PT-Stemmer",
             "no_index" : {
                "directory" : [
-                  "inc",
-                  "t"
+                  "t",
+                  "inc"
                ]
             },
             "prereqs" : {
                "build" : {
                   "requires" : {
-                     "ExtUtils::MakeMaker" : "6.42",
-                     "Test::More" : 0
+                     "ExtUtils::MakeMaker" : 0
                   }
                },
                "configure" : {
                   "requires" : {
-                     "ExtUtils::MakeMaker" : "6.42"
+                     "ExtUtils::MakeMaker" : 0
                   }
                },
                "runtime" : {
-                  "recommends" : {
-                     "HTML::Parser" : "3.56",
-                     "Lingua::EN::Sentence" : "0.25",
-                     "PPI" : "1.203",
-                     "Template" : "2.20",
-                     "Template::Constants" : "2.75",
-                     "YAML" : "0.66",
-                     "YAML::Loader" : "0.66"
-                  },
+                  "requires" : {}
+               }
+            },
+            "release_status" : "stable",
+            "version" : "0.01"
+         },
+         "name" : "Lingua::PT::Stemmer",
+         "pathname" : "X/XE/XERN/Lingua-PT-Stemmer-0.01.tar.gz",
+         "provides" : {
+            "Lingua::GL::Stemmer" : {
+               "file" : "Lingua/GL/Stemmer.pm",
+               "version" : "0.01"
+            },
+            "Lingua::PT::Stemmer" : {
+               "file" : "Lingua/PT/Stemmer.pm",
+               "version" : "0.01"
+            }
+         },
+         "version" : "0.01"
+      },
+      "Lingua::Stem" : {
+         "dist" : "Lingua-Stem-0.84",
+         "module" : "Lingua::Stem",
+         "mymeta" : {
+            "abstract" : "Stemming of words in various languages",
+            "author" : [
+               "Benjamin Franz <snowhare@nihongo.org>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "perl_5"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "Lingua-Stem",
+            "prereqs" : {
+               "runtime" : {
                   "requires" : {
-                     "Locale::Maketext" : "1.17",
-                     "perl" : "5.005"
+                     "Carp" : 0,
+                     "Lingua::GL::Stemmer" : 0,
+                     "Lingua::PT::Stemmer" : 0,
+                     "Lingua::Stem::Fr" : "0.02",
+                     "Lingua::Stem::It" : 0,
+                     "Lingua::Stem::Ru" : 0,
+                     "Lingua::Stem::Snowball::Da" : "1.01",
+                     "Lingua::Stem::Snowball::No" : "1.00",
+                     "Lingua::Stem::Snowball::Se" : "1.01",
+                     "Text::German" : 0
                   }
                }
             },
+            "provides" : {
+               "Lingua::Stem" : {
+                  "file" : "lib/Lingua/Stem.pm",
+                  "version" : "0.84"
+               },
+               "Lingua::Stem::AutoLoader" : {
+                  "file" : "lib/Lingua/Stem/AutoLoader.pm",
+                  "version" : "1.02"
+               },
+               "Lingua::Stem::Da" : {
+                  "file" : "lib/Lingua/Stem/Da.pm",
+                  "version" : "1.01"
+               },
+               "Lingua::Stem::De" : {
+                  "file" : "lib/Lingua/Stem/De.pm",
+                  "version" : "1.01"
+               },
+               "Lingua::Stem::En" : {
+                  "file" : "lib/Lingua/Stem/En.pm",
+                  "version" : "2.16"
+               },
+               "Lingua::Stem::EnBroken" : {
+                  "file" : "lib/Lingua/Stem/EnBroken.pm",
+                  "version" : "2.13"
+               },
+               "Lingua::Stem::Gl" : {
+                  "file" : "lib/Lingua/Stem/Gl.pm",
+                  "version" : "1.02"
+               },
+               "Lingua::Stem::No" : {
+                  "file" : "lib/Lingua/Stem/No.pm",
+                  "version" : "1.01"
+               },
+               "Lingua::Stem::Pt" : {
+                  "file" : "lib/Lingua/Stem/Pt.pm",
+                  "version" : "1.01"
+               },
+               "Lingua::Stem::Sv" : {
+                  "file" : "lib/Lingua/Stem/Sv.pm",
+                  "version" : "1.01"
+               }
+            },
             "release_status" : "stable",
             "resources" : {
                "license" : [
-                  "http://opensource.org/licenses/mit-license.php"
+                  "http://dev.perl.org/licenses/"
                ]
             },
-            "version" : "0.91"
+            "version" : "0.84"
          },
-         "name" : "Locale::Maketext::Lexicon",
-         "pathname" : "D/DR/DRTECH/Locale-Maketext-Lexicon-0.91.tar.gz",
+         "name" : "Lingua::Stem",
+         "pathname" : "S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz",
          "provides" : {
-            "Locale::Maketext::Extract" : {
-               "file" : "Locale/Maketext/Extract.pm",
-               "version" : "0.38"
+            "Lingua::Stem" : {
+               "file" : "Lingua/Stem.pm",
+               "version" : "0.84"
             },
-            "Locale::Maketext::Extract::Plugin::Base" : {
-               "file" : "Locale/Maketext/Extract/Plugin/Base.pm"
+            "Lingua::Stem::AutoLoader" : {
+               "file" : "Lingua/Stem/AutoLoader.pm",
+               "version" : "1.02"
             },
-            "Locale::Maketext::Extract::Plugin::FormFu" : {
-               "file" : "Locale/Maketext/Extract/Plugin/FormFu.pm"
+            "Lingua::Stem::Da" : {
+               "file" : "Lingua/Stem/Da.pm",
+               "version" : "1.01"
             },
-            "Locale::Maketext::Extract::Plugin::FormFu::Extractor" : {
-               "file" : "Locale/Maketext/Extract/Plugin/FormFu.pm"
+            "Lingua::Stem::De" : {
+               "file" : "Lingua/Stem/De.pm",
+               "version" : "1.01"
             },
-            "Locale::Maketext::Extract::Plugin::Generic" : {
-               "file" : "Locale/Maketext/Extract/Plugin/Generic.pm"
+            "Lingua::Stem::En" : {
+               "file" : "Lingua/Stem/En.pm",
+               "version" : "2.16"
             },
-            "Locale::Maketext::Extract::Plugin::Mason" : {
-               "file" : "Locale/Maketext/Extract/Plugin/Mason.pm"
+            "Lingua::Stem::EnBroken" : {
+               "file" : "Lingua/Stem/EnBroken.pm",
+               "version" : "2.13"
             },
-            "Locale::Maketext::Extract::Plugin::PPI" : {
-               "file" : "Locale/Maketext/Extract/Plugin/PPI.pm"
+            "Lingua::Stem::Gl" : {
+               "file" : "Lingua/Stem/Gl.pm",
+               "version" : "1.02"
             },
-            "Locale::Maketext::Extract::Plugin::Perl" : {
-               "file" : "Locale/Maketext/Extract/Plugin/Perl.pm"
+            "Lingua::Stem::No" : {
+               "file" : "Lingua/Stem/No.pm",
+               "version" : "1.01"
             },
-            "Locale::Maketext::Extract::Plugin::TT2" : {
-               "file" : "Locale/Maketext/Extract/Plugin/TT2.pm"
+            "Lingua::Stem::Pt" : {
+               "file" : "Lingua/Stem/Pt.pm",
+               "version" : "1.01"
             },
-            "Locale::Maketext::Extract::Plugin::TT2::Directive" : {
-               "file" : "Locale/Maketext/Extract/Plugin/TT2.pm"
+            "Lingua::Stem::Sv" : {
+               "file" : "Lingua/Stem/Sv.pm",
+               "version" : "1.01"
+            }
+         },
+         "version" : "0.84"
+      },
+      "Lingua::Stem::Fr" : {
+         "dist" : "Lingua-Stem-Fr-0.02",
+         "module" : "Lingua::Stem::Fr",
+         "mymeta" : {
+            "abstract" : "unknown",
+            "author" : [
+               "unknown"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "unknown"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
             },
-            "Locale::Maketext::Extract::Plugin::TT2::Parser" : {
-               "file" : "Locale/Maketext/Extract/Plugin/TT2.pm"
+            "name" : "Lingua-Stem-Fr",
+            "no_index" : {
+               "directory" : [
+                  "t",
+                  "inc"
+               ]
             },
-            "Locale::Maketext::Extract::Plugin::TextTemplate" : {
-               "file" : "Locale/Maketext/Extract/Plugin/TextTemplate.pm",
-               "version" : "0.31"
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {}
+               }
             },
-            "Locale::Maketext::Extract::Plugin::TextTemplate::Parser" : {
-               "file" : "Locale/Maketext/Extract/Plugin/TextTemplate.pm"
+            "release_status" : "stable",
+            "version" : "0.02"
+         },
+         "name" : "Lingua::Stem::Fr",
+         "pathname" : "S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz",
+         "provides" : {
+            "Lingua::Stem::Fr" : {
+               "file" : "Lingua/Stem/Fr.pm",
+               "version" : "0.02"
+            }
+         },
+         "version" : "0.02"
+      },
+      "Lingua::Stem::It" : {
+         "dist" : "Lingua-Stem-It-0.02",
+         "module" : "Lingua::Stem::It",
+         "mymeta" : {
+            "abstract" : "Porter's stemming algorithm for Italian",
+            "author" : [
+               "Aldo Calpini <dada@perl.it>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "unknown"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
             },
-            "Locale::Maketext::Extract::Plugin::YAML" : {
-               "file" : "Locale/Maketext/Extract/Plugin/YAML.pm"
+            "name" : "Lingua-Stem-It",
+            "no_index" : {
+               "directory" : [
+                  "t",
+                  "inc"
+               ]
             },
-            "Locale::Maketext::Extract::Plugin::YAML::Extractor" : {
-               "file" : "Locale/Maketext/Extract/Plugin/YAML.pm"
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {}
+               }
             },
-            "Locale::Maketext::Extract::Run" : {
-               "file" : "Locale/Maketext/Extract/Run.pm"
+            "release_status" : "stable",
+            "version" : "0.02"
+         },
+         "name" : "Lingua::Stem::It",
+         "pathname" : "A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz",
+         "provides" : {
+            "Lingua::Stem::It" : {
+               "file" : "Lingua/Stem/It.pm",
+               "version" : "0.02"
+            }
+         },
+         "version" : "0.02"
+      },
+      "Lingua::Stem::Ru" : {
+         "dist" : "Lingua-Stem-Ru-0.01",
+         "module" : "Lingua::Stem::Ru",
+         "mymeta" : {
+            "abstract" : "Porter's stemming algorithm for Russian",
+            "author" : [
+               "Aleksandr Guidrevitch <pillgrim@mail.ru>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "unknown"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
             },
-            "Locale::Maketext::Lexicon" : {
-               "file" : "Locale/Maketext/Lexicon.pm",
-               "version" : "0.91"
+            "name" : "Lingua-Stem-Ru",
+            "no_index" : {
+               "directory" : [
+                  "t",
+                  "inc"
+               ]
             },
-            "Locale::Maketext::Lexicon::Auto" : {
-               "file" : "Locale/Maketext/Lexicon/Auto.pm",
-               "version" : "0.10"
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {}
+               }
             },
-            "Locale::Maketext::Lexicon::Extract::Run" : {
-               "file" : "Locale/Maketext/Extract/Run.pm",
-               "version" : "0.35"
+            "release_status" : "stable",
+            "version" : "0.01"
+         },
+         "name" : "Lingua::Stem::Ru",
+         "pathname" : "A/AL/ALGDR/Lingua-Stem-Ru-0.01.tar.gz",
+         "provides" : {
+            "Lingua::Stem::Ru" : {
+               "file" : "Lingua/Stem/Ru.pm",
+               "version" : "0.01"
+            }
+         },
+         "version" : "0.01"
+      },
+      "Lingua::Stem::Snowball::Da" : {
+         "dist" : "Lingua-Stem-Snowball-Da-1.01",
+         "module" : "Lingua::Stem::Snowball::Da",
+         "mymeta" : {
+            "abstract" : "Porters stemming algorithm for Denmark",
+            "author" : [
+               "Dennis Haney <davh@davh.dk>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "unknown"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
             },
-            "Locale::Maketext::Lexicon::Gettext" : {
-               "file" : "Locale/Maketext/Lexicon/Gettext.pm",
-               "version" : "0.17"
+            "name" : "Lingua-Stem-Snowball-Da",
+            "no_index" : {
+               "directory" : [
+                  "t",
+                  "inc"
+               ]
             },
-            "Locale::Maketext::Lexicon::Msgcat" : {
-               "file" : "Locale/Maketext/Lexicon/Msgcat.pm",
-               "version" : "0.03"
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {}
+               }
             },
-            "Locale::Maketext::Lexicon::Tie" : {
-               "file" : "Locale/Maketext/Lexicon/Tie.pm",
-               "version" : "0.05"
+            "release_status" : "stable",
+            "version" : "1.01"
+         },
+         "name" : "Lingua::Stem::Snowball::Da",
+         "pathname" : "C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz",
+         "provides" : {
+            "Lingua::Stem::Snowball::Da" : {
+               "file" : "Lingua/Stem/Snowball/Da.pm",
+               "version" : "1.01"
+            }
+         },
+         "version" : "1.01"
+      },
+      "Lingua::Stem::Snowball::No" : {
+         "dist" : "Snowball-Norwegian-1.2",
+         "module" : "Lingua::Stem::Snowball::No",
+         "mymeta" : {
+            "abstract" : "Porters stemming algorithm for norwegian.",
+            "author" : [
+               "Ask Solem <ASKSH@cpan.org>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "perl_5"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "Snowball-Norwegian",
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "Test::More" : "0.42"
+                  }
+               }
+            },
+            "provides" : {
+               "Lingua::Stem::Snowball::No" : {
+                  "file" : "lib/Lingua/Stem/Snowball/No.pm",
+                  "version" : "1.2"
+               }
+            },
+            "release_status" : "stable",
+            "resources" : {
+               "license" : [
+                  "http://dev.perl.org/licenses/"
+               ]
+            },
+            "version" : "1.2"
+         },
+         "name" : "Lingua::Stem::Snowball::No",
+         "pathname" : "A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz",
+         "provides" : {
+            "Lingua::Stem::Snowball::No" : {
+               "file" : "Lingua/Stem/Snowball/No.pm",
+               "version" : "1.2"
+            }
+         },
+         "version" : "1.2"
+      },
+      "Lingua::Stem::Snowball::Se" : {
+         "dist" : "Snowball-Swedish-1.2",
+         "module" : "Lingua::Stem::Snowball::Se",
+         "mymeta" : {
+            "abstract" : "Porters stemming algorithm for swedish.",
+            "author" : [
+               "Ask Solem <ASKSH@cpan.org>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "perl_5"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "Snowball-Swedish",
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "Test::More" : "0.42"
+                  }
+               }
+            },
+            "provides" : {
+               "Lingua::Stem::Snowball::Se" : {
+                  "file" : "lib/Lingua/Stem/Snowball/Se.pm",
+                  "version" : "1.2"
+               }
+            },
+            "release_status" : "stable",
+            "resources" : {
+               "license" : [
+                  "http://dev.perl.org/licenses/"
+               ]
+            },
+            "version" : "1.2"
+         },
+         "name" : "Lingua::Stem::Snowball::Se",
+         "pathname" : "A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz",
+         "provides" : {
+            "Lingua::Stem::Snowball::Se" : {
+               "file" : "Lingua/Stem/Snowball/Se.pm",
+               "version" : "1.2"
+            }
+         },
+         "version" : "1.2"
+      },
+      "List::MoreUtils" : {
+         "dist" : "List-MoreUtils-0.33",
+         "module" : "List::MoreUtils",
+         "mymeta" : {
+            "abstract" : "Provide the stuff missing in List::Util",
+            "author" : [
+               "Tassilo von Parseval <tassilo.von.parseval@rwth-aachen.de>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "perl_5"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "List-MoreUtils",
+            "no_index" : {
+               "directory" : [
+                  "t",
+                  "inc"
+               ]
+            },
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "Test::More" : "0.42"
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::CBuilder" : "0.27",
+                     "ExtUtils::MakeMaker" : "6.52"
+                  }
+               },
+               "runtime" : {
+                  "requires" : {
+                     "Test::More" : "0.82",
+                     "perl" : "5.00503"
+                  }
+               }
+            },
+            "release_status" : "stable",
+            "version" : "0.33"
+         },
+         "name" : "List::MoreUtils",
+         "pathname" : "A/AD/ADAMK/List-MoreUtils-0.33.tar.gz",
+         "provides" : {
+            "List::MoreUtils" : {
+               "file" : "List/MoreUtils.pm",
+               "version" : "0.33"
             }
          },
-         "version" : "0.91"
+         "version" : "0.33"
       },
       "Log::Log4perl" : {
          "dist" : "Log-Log4perl-1.34",
@@ -16595,91 +17511,24 @@
          },
          "version" : "2.08"
       },
-      "Math::BigInt" : {
-         "dist" : "Math-BigInt-1.997",
-         "module" : "Math::BigInt",
-         "mymeta" : {
-            "abstract" : "Arbitrary size integer/float math package",
-            "author" : [
-               "Original code by Mark Biggar, overloaded interface by Ilya Zakharevich., Tels <nospam-abuse@bloodgate.com>"
-            ],
-            "dynamic_config" : 0,
-            "generated_by" : "ExtUtils::MakeMaker version 6.59, CPAN::Meta::Converter version 2.112150",
-            "license" : [
-               "perl_5"
-            ],
-            "meta-spec" : {
-               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-               "version" : "2"
-            },
-            "name" : "Math-BigInt",
-            "no_index" : {
-               "directory" : [
-                  "t",
-                  "inc"
-               ]
-            },
-            "prereqs" : {
-               "build" : {
-                  "requires" : {
-                     "ExtUtils::MakeMaker" : "6.42",
-                     "Test::More" : "0.62"
-                  }
-               },
-               "configure" : {
-                  "requires" : {
-                     "ExtUtils::MakeMaker" : 0
-                  }
-               },
-               "runtime" : {
-                  "requires" : {
-                     "perl" : "5.006002"
-                  }
-               }
-            },
-            "release_status" : "stable",
-            "version" : "1.997"
-         },
-         "name" : "Math::BigInt",
-         "pathname" : "P/PJ/PJACKLAM/Math-BigInt-1.997.tar.gz",
-         "provides" : {
-            "Math::BigFloat" : {
-               "file" : "Math/BigFloat.pm",
-               "version" : "1.997"
-            },
-            "Math::BigInt" : {
-               "file" : "Math/BigInt.pm",
-               "version" : "1.997"
-            },
-            "Math::BigInt::Calc" : {
-               "file" : "Math/BigInt/Calc.pm",
-               "version" : "1.997"
-            },
-            "Math::BigInt::CalcEmu" : {
-               "file" : "Math/BigInt/CalcEmu.pm",
-               "version" : "1.997"
-            }
-         },
-         "version" : "1.997"
-      },
-      "Math::BigInt::GMP" : {
-         "dist" : "Math-BigInt-GMP-1.37",
-         "module" : "Math::BigInt::GMP",
+      "Math::Round" : {
+         "dist" : "Math-Round-0.06",
+         "module" : "Math::Round",
          "mymeta" : {
-            "abstract" : "Use the GMP library for Math::BigInt routines",
+            "abstract" : "unknown",
             "author" : [
-               "Tels"
+               "unknown"
             ],
             "dynamic_config" : 0,
-            "generated_by" : "ExtUtils::MakeMaker version 6.59, CPAN::Meta::Converter version 2.112150",
+            "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150",
             "license" : [
-               "perl_5"
+               "unknown"
             ],
             "meta-spec" : {
                "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
                "version" : "2"
             },
-            "name" : "Math-BigInt-GMP",
+            "name" : "Math-Round",
             "no_index" : {
                "directory" : [
                   "t",
@@ -16698,28 +17547,25 @@
                   }
                },
                "runtime" : {
-                  "requires" : {
-                     "Math::BigInt" : "1.997",
-                     "XSLoader" : "0.02"
-                  }
+                  "requires" : {}
                }
             },
             "release_status" : "stable",
-            "version" : "1.37"
+            "version" : "0.06"
          },
-         "name" : "Math::BigInt::GMP",
-         "pathname" : "P/PJ/PJACKLAM/Math-BigInt-GMP-1.37.tar.gz",
+         "name" : "Math::Round",
+         "pathname" : "G/GR/GROMMEL/Math-Round-0.06.tar.gz",
          "provides" : {
-            "Math::BigInt::GMP" : {
-               "file" : "Math/BigInt/GMP.pm",
-               "version" : "1.37"
+            "Math::Round" : {
+               "file" : "Math/Round.pm",
+               "version" : "0.06"
             }
          },
-         "version" : "1.37"
+         "version" : "0.06"
       },
-      "Math::Round" : {
-         "dist" : "Math-Round-0.06",
-         "module" : "Math::Round",
+      "Memoize::ExpireLRU" : {
+         "dist" : "Memoize-ExpireLRU-0.55",
+         "module" : "Memoize::ExpireLRU",
          "mymeta" : {
             "abstract" : "unknown",
             "author" : [
@@ -16734,7 +17580,7 @@
                "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
                "version" : "2"
             },
-            "name" : "Math-Round",
+            "name" : "Memoize-ExpireLRU",
             "no_index" : {
                "directory" : [
                   "t",
@@ -16753,21 +17599,23 @@
                   }
                },
                "runtime" : {
-                  "requires" : {}
+                  "requires" : {
+                     "Memoize" : "0.52"
+                  }
                }
             },
             "release_status" : "stable",
-            "version" : "0.06"
+            "version" : "0.55"
          },
-         "name" : "Math::Round",
-         "pathname" : "G/GR/GROMMEL/Math-Round-0.06.tar.gz",
+         "name" : "Memoize::ExpireLRU",
+         "pathname" : "B/BP/BPOWERS/Memoize-ExpireLRU-0.55.tar.gz",
          "provides" : {
-            "Math::Round" : {
-               "file" : "Math/Round.pm",
-               "version" : "0.06"
+            "Memoize::ExpireLRU" : {
+               "file" : "Memoize/ExpireLRU.pm",
+               "version" : "0.55"
             }
          },
-         "version" : "0.06"
+         "version" : "0.55"
       },
       "Module::Build" : {
          "dist" : "Module-Build-0.3800",
@@ -17312,7 +18160,7 @@
          "version" : "0.10"
       },
       "Module::Metadata" : {
-         "dist" : "Module-Metadata-1.000007",
+         "dist" : "Module-Metadata-1.000009",
          "module" : "Module::Metadata",
          "mymeta" : {
             "abstract" : "Gather package and POD information from perl module files",
@@ -17320,7 +18168,7 @@
                "Ken Williams <kwilliams@cpan.org>, Randy W. Sims <RandyS@ThePierianSpring.org>"
             ],
             "dynamic_config" : 0,
-            "generated_by" : "ExtUtils::MakeMaker version 6.59, CPAN::Meta::Converter version 2.112150",
+            "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112621, CPAN::Meta::Converter version 2.112150",
             "license" : [
                "perl_5"
             ],
@@ -17348,22 +18196,29 @@
                },
                "runtime" : {
                   "requires" : {
-                     "version" : "0.87"
+                     "Carp" : 0,
+                     "File::Find" : 0,
+                     "File::Spec" : 0,
+                     "IO::File" : 0,
+                     "strict" : 0,
+                     "vars" : 0,
+                     "version" : "0.87",
+                     "warnings" : 0
                   }
                }
             },
             "release_status" : "stable",
-            "version" : "1.000007"
+            "version" : "1.000009"
          },
          "name" : "Module::Metadata",
-         "pathname" : "D/DA/DAGOLDEN/Module-Metadata-1.000007.tar.gz",
+         "pathname" : "D/DA/DAGOLDEN/Module-Metadata-1.000009.tar.gz",
          "provides" : {
             "Module::Metadata" : {
                "file" : "Module/Metadata.pm",
-               "version" : "1.000007"
+               "version" : "1.000009"
             }
          },
-         "version" : "1.000007"
+         "version" : "1.000009"
       },
       "Module::Runtime" : {
          "dist" : "Module-Runtime-0.011",
@@ -22024,6 +22879,1040 @@
          },
          "version" : "1.666001"
       },
+      "SOAP::WSDL" : {
+         "dist" : "SOAP-WSDL-2.00.10",
+         "module" : "SOAP::WSDL::Client::Base",
+         "mymeta" : {
+            "abstract" : "SOAP with WSDL support",
+            "author" : [
+               "Martin Kutter <martin.kutter@fen-net.de>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "artistic_1"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "SOAP-WSDL",
+            "no_index" : {
+               "directory" : [
+                  "lib/SOAP/WSDL/Generator/Template/XSD/"
+               ]
+            },
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "Class::Std::Fast" : "v0.0.5",
+                     "Cwd" : 0,
+                     "Date::Format" : 0,
+                     "Date::Parse" : 0,
+                     "File::Basename" : 0,
+                     "File::Path" : 0,
+                     "File::Spec" : 0,
+                     "Getopt::Long" : 0,
+                     "LWP::UserAgent" : 0,
+                     "List::Util" : 0,
+                     "Module::Build" : 0,
+                     "Storable" : 0,
+                     "Template" : "2.18",
+                     "Test::More" : 0,
+                     "XML::Parser::Expat" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {
+                     "Class::Std::Fast" : "v0.0.5",
+                     "Data::Dumper" : 0,
+                     "Date::Format" : 0,
+                     "Date::Parse" : 0,
+                     "File::Basename" : 0,
+                     "File::Path" : 0,
+                     "Getopt::Long" : 0,
+                     "LWP::UserAgent" : 0,
+                     "List::Util" : 0,
+                     "Template" : "2.18",
+                     "Term::ReadKey" : 0,
+                     "URI" : 0,
+                     "XML::Parser::Expat" : 0,
+                     "perl" : "v5.8.0"
+                  }
+               }
+            },
+            "provides" : {
+               "SOAP::WSDL" : {
+                  "file" : "lib/SOAP/WSDL.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Base" : {
+                  "file" : "lib/SOAP/WSDL/Base.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Binding" : {
+                  "file" : "lib/SOAP/WSDL/Binding.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Client" : {
+                  "file" : "lib/SOAP/WSDL/Client.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Client::Base" : {
+                  "file" : "lib/SOAP/WSDL/Client/Base.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Definitions" : {
+                  "file" : "lib/SOAP/WSDL/Definitions.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Deserializer::Hash" : {
+                  "file" : "lib/SOAP/WSDL/Deserializer/Hash.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Deserializer::SOM" : {
+                  "file" : "lib/SOAP/WSDL/Deserializer/SOM.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Deserializer::XSD" : {
+                  "file" : "lib/SOAP/WSDL/Deserializer/XSD.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Expat::Base" : {
+                  "file" : "lib/SOAP/WSDL/Expat/Base.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Expat::Message2Hash" : {
+                  "file" : "lib/SOAP/WSDL/Expat/Message2Hash.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Expat::MessageParser" : {
+                  "file" : "lib/SOAP/WSDL/Expat/MessageParser.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Expat::MessageStreamParser" : {
+                  "file" : "lib/SOAP/WSDL/Expat/MessageStreamParser.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Expat::WSDLParser" : {
+                  "file" : "lib/SOAP/WSDL/Expat/WSDLParser.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Factory::Deserializer" : {
+                  "file" : "lib/SOAP/WSDL/Factory/Deserializer.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Factory::Generator" : {
+                  "file" : "lib/SOAP/WSDL/Factory/Generator.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Factory::Serializer" : {
+                  "file" : "lib/SOAP/WSDL/Factory/Serializer.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Factory::Transport" : {
+                  "file" : "lib/SOAP/WSDL/Factory/Transport.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Generator::Iterator::WSDL11" : {
+                  "file" : "lib/SOAP/WSDL/Generator/Iterator/WSDL11.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Generator::PrefixResolver" : {
+                  "file" : "lib/SOAP/WSDL/Generator/PrefixResolver.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Generator::Template" : {
+                  "file" : "lib/SOAP/WSDL/Generator/Template.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Generator::Template::Plugin::XSD" : {
+                  "file" : "lib/SOAP/WSDL/Generator/Template/Plugin/XSD.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Generator::Template::XSD" : {
+                  "file" : "lib/SOAP/WSDL/Generator/Template/XSD.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Generator::Visitor" : {
+                  "file" : "lib/SOAP/WSDL/Generator/Visitor.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Generator::Visitor::Typemap" : {
+                  "file" : "lib/SOAP/WSDL/Generator/Visitor/Typemap.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Message" : {
+                  "file" : "lib/SOAP/WSDL/Message.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::OpMessage" : {
+                  "file" : "lib/SOAP/WSDL/OpMessage.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Operation" : {
+                  "file" : "lib/SOAP/WSDL/Operation.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Part" : {
+                  "file" : "lib/SOAP/WSDL/Part.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Port" : {
+                  "file" : "lib/SOAP/WSDL/Port.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::PortType" : {
+                  "file" : "lib/SOAP/WSDL/PortType.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::SOAP::Address" : {
+                  "file" : "lib/SOAP/WSDL/SOAP/Address.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::SOAP::Body" : {
+                  "file" : "lib/SOAP/WSDL/SOAP/Body.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::SOAP::Header" : {
+                  "file" : "lib/SOAP/WSDL/SOAP/Header.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::SOAP::HeaderFault" : {
+                  "file" : "lib/SOAP/WSDL/SOAP/HeaderFault.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::SOAP::Operation" : {
+                  "file" : "lib/SOAP/WSDL/SOAP/Operation.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::SOAP::Typelib::Fault" : {
+                  "file" : "lib/SOAP/WSDL/SOAP/Typelib/Fault.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::SOAP::Typelib::Fault11" : {
+                  "file" : "lib/SOAP/WSDL/SOAP/Typelib/Fault11.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::SOAP::Typelib::Fault11Detail" : {
+                  "file" : "lib/SOAP/WSDL/SOAP/Typelib/Fault11.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::Serializer::XSD" : {
+                  "file" : "lib/SOAP/WSDL/Serializer/XSD.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Server" : {
+                  "file" : "lib/SOAP/WSDL/Server.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Server::CGI" : {
+                  "file" : "lib/SOAP/WSDL/Server/CGI.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Server::Mod_Perl2" : {
+                  "file" : "lib/SOAP/WSDL/Server/Mod_Perl2.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Server::Simple" : {
+                  "file" : "lib/SOAP/WSDL/Server/Simple.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Service" : {
+                  "file" : "lib/SOAP/WSDL/Service.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Transport::HTTP" : {
+                  "file" : "lib/SOAP/WSDL/Transport/HTTP.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Transport::Loopback" : {
+                  "file" : "lib/SOAP/WSDL/Transport/Loopback.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Transport::Test" : {
+                  "file" : "lib/SOAP/WSDL/Transport/Test.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::TypeLookup" : {
+                  "file" : "lib/SOAP/WSDL/TypeLookup.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::Types" : {
+                  "file" : "lib/SOAP/WSDL/Types.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Annotation" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Annotation.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Attribute" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Attribute.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::AttributeGroup" : {
+                  "file" : "lib/SOAP/WSDL/XSD/AttributeGroup.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Builtin" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Builtin.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::ComplexType" : {
+                  "file" : "lib/SOAP/WSDL/XSD/ComplexType.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Element" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Element.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Enumeration" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Enumeration.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::FractionDigits" : {
+                  "file" : "lib/SOAP/WSDL/XSD/FractionDigits.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Group" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Group.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Length" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Length.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::MaxExclusive" : {
+                  "file" : "lib/SOAP/WSDL/XSD/MaxExclusive.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::MaxInclusive" : {
+                  "file" : "lib/SOAP/WSDL/XSD/MaxInclusive.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::MaxLength" : {
+                  "file" : "lib/SOAP/WSDL/XSD/MaxLength.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::MinExclusive" : {
+                  "file" : "lib/SOAP/WSDL/XSD/MinExclusive.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::MinInclusive" : {
+                  "file" : "lib/SOAP/WSDL/XSD/MinInclusive.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::MinLength" : {
+                  "file" : "lib/SOAP/WSDL/XSD/MinLength.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Pattern" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Pattern.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Schema" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Schema.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Schema::Builtin" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Schema/Builtin.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::SimpleType" : {
+                  "file" : "lib/SOAP/WSDL/XSD/SimpleType.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::TotalDigits" : {
+                  "file" : "lib/SOAP/WSDL/XSD/TotalDigits.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Typelib::Attribute" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Attribute.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Typelib::AttributeSet" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/AttributeSet.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::ENTITY" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::ID" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/ID.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::IDREF" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/IDREF.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::IDREFS" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/IDREFS.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::NCName" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NCName.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKEN" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NMTOKEN.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKENS" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NMTOKENS.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::NOTATION" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NOTATION.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::Name" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/Name.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::QName" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/QName.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/anySimpleType.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::anyType" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/anyType.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::anyURI" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/anyURI.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::base64Binary" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/base64Binary.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::boolean" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/boolean.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::byte" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/byte.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::date" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/date.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::dateTime" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/dateTime.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::decimal" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/decimal.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::double" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/double.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::duration" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/duration.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::float" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/float.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::gDay" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gDay.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::gMonth" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gMonth.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::gMonthDay" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gMonthDay.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::gYear" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gYear.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::gYearMonth" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gYearMonth.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::hexBinary" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/hexBinary.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::int" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/int.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::integer" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/integer.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::language" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/language.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::list" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/list.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::long" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/long.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::negativeInteger" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/negativeInteger.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/nonNegativeInteger.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::nonPositiveInteger" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/nonPositiveInteger.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::normalizedString" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/normalizedString.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::positiveInteger" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/positiveInteger.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::short" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/short.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::string" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/string.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::time" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/time.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::token" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/token.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedByte.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedInt.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedLong.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::Builtin::unsignedShort" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.pm",
+                  "version" : 0
+               },
+               "SOAP::WSDL::XSD::Typelib::ComplexType" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Typelib::Element" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/Element.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Typelib::SimpleType" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::Typelib::SimpleType::restriction" : {
+                  "file" : "lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm",
+                  "version" : "v2.0.10"
+               },
+               "SOAP::WSDL::XSD::WhiteSpace" : {
+                  "file" : "lib/SOAP/WSDL/XSD/WhiteSpace.pm",
+                  "version" : "v2.0.10"
+               }
+            },
+            "release_status" : "stable",
+            "resources" : {
+               "license" : [
+                  "http://opensource.org/licenses/artistic-license.php"
+               ]
+            },
+            "version" : "2.00.10"
+         },
+         "name" : "SOAP::WSDL",
+         "pathname" : "M/MK/MKUTTER/SOAP-WSDL-2.00.10.tar.gz",
+         "provides" : {
+            "SOAP::WSDL" : {
+               "file" : "SOAP/WSDL.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Base" : {
+               "file" : "SOAP/WSDL/Base.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Binding" : {
+               "file" : "SOAP/WSDL/Binding.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Client" : {
+               "file" : "SOAP/WSDL/Client.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Client::Base" : {
+               "file" : "SOAP/WSDL/Client/Base.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Definitions" : {
+               "file" : "SOAP/WSDL/Definitions.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Deserializer::Hash" : {
+               "file" : "SOAP/WSDL/Deserializer/Hash.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Deserializer::SOM" : {
+               "file" : "SOAP/WSDL/Deserializer/SOM.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Deserializer::XSD" : {
+               "file" : "SOAP/WSDL/Deserializer/XSD.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Expat::Base" : {
+               "file" : "SOAP/WSDL/Expat/Base.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Expat::Message2Hash" : {
+               "file" : "SOAP/WSDL/Expat/Message2Hash.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Expat::MessageParser" : {
+               "file" : "SOAP/WSDL/Expat/MessageParser.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Expat::MessageStreamParser" : {
+               "file" : "SOAP/WSDL/Expat/MessageStreamParser.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Expat::WSDLParser" : {
+               "file" : "SOAP/WSDL/Expat/WSDLParser.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Factory::Deserializer" : {
+               "file" : "SOAP/WSDL/Factory/Deserializer.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Factory::Generator" : {
+               "file" : "SOAP/WSDL/Factory/Generator.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Factory::Serializer" : {
+               "file" : "SOAP/WSDL/Factory/Serializer.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Factory::Transport" : {
+               "file" : "SOAP/WSDL/Factory/Transport.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Generator::Iterator::WSDL11" : {
+               "file" : "SOAP/WSDL/Generator/Iterator/WSDL11.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Generator::PrefixResolver" : {
+               "file" : "SOAP/WSDL/Generator/PrefixResolver.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Generator::Template" : {
+               "file" : "SOAP/WSDL/Generator/Template.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Generator::Template::Plugin::XSD" : {
+               "file" : "SOAP/WSDL/Generator/Template/Plugin/XSD.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Generator::Template::XSD" : {
+               "file" : "SOAP/WSDL/Generator/Template/XSD.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Generator::Visitor" : {
+               "file" : "SOAP/WSDL/Generator/Visitor.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Generator::Visitor::Typemap" : {
+               "file" : "SOAP/WSDL/Generator/Visitor/Typemap.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Message" : {
+               "file" : "SOAP/WSDL/Message.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::OpMessage" : {
+               "file" : "SOAP/WSDL/OpMessage.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Operation" : {
+               "file" : "SOAP/WSDL/Operation.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Part" : {
+               "file" : "SOAP/WSDL/Part.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Port" : {
+               "file" : "SOAP/WSDL/Port.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::PortType" : {
+               "file" : "SOAP/WSDL/PortType.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::SOAP::Address" : {
+               "file" : "SOAP/WSDL/SOAP/Address.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::SOAP::Body" : {
+               "file" : "SOAP/WSDL/SOAP/Body.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::SOAP::Header" : {
+               "file" : "SOAP/WSDL/SOAP/Header.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::SOAP::HeaderFault" : {
+               "file" : "SOAP/WSDL/SOAP/HeaderFault.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::SOAP::Operation" : {
+               "file" : "SOAP/WSDL/SOAP/Operation.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::SOAP::Typelib::Fault" : {
+               "file" : "SOAP/WSDL/SOAP/Typelib/Fault.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::SOAP::Typelib::Fault11" : {
+               "file" : "SOAP/WSDL/SOAP/Typelib/Fault11.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::SOAP::Typelib::Fault11Detail" : {
+               "file" : "SOAP/WSDL/SOAP/Typelib/Fault11.pm"
+            },
+            "SOAP::WSDL::Serializer::XSD" : {
+               "file" : "SOAP/WSDL/Serializer/XSD.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Server" : {
+               "file" : "SOAP/WSDL/Server.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Server::CGI" : {
+               "file" : "SOAP/WSDL/Server/CGI.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Server::Mod_Perl2" : {
+               "file" : "SOAP/WSDL/Server/Mod_Perl2.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Server::Simple" : {
+               "file" : "SOAP/WSDL/Server/Simple.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Service" : {
+               "file" : "SOAP/WSDL/Service.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Transport::HTTP" : {
+               "file" : "SOAP/WSDL/Transport/HTTP.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Transport::Loopback" : {
+               "file" : "SOAP/WSDL/Transport/Loopback.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Transport::Test" : {
+               "file" : "SOAP/WSDL/Transport/Test.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::TypeLookup" : {
+               "file" : "SOAP/WSDL/TypeLookup.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::Types" : {
+               "file" : "SOAP/WSDL/Types.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Annotation" : {
+               "file" : "SOAP/WSDL/XSD/Annotation.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Attribute" : {
+               "file" : "SOAP/WSDL/XSD/Attribute.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::AttributeGroup" : {
+               "file" : "SOAP/WSDL/XSD/AttributeGroup.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Builtin" : {
+               "file" : "SOAP/WSDL/XSD/Builtin.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::ComplexType" : {
+               "file" : "SOAP/WSDL/XSD/ComplexType.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Element" : {
+               "file" : "SOAP/WSDL/XSD/Element.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Enumeration" : {
+               "file" : "SOAP/WSDL/XSD/Enumeration.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::FractionDigits" : {
+               "file" : "SOAP/WSDL/XSD/FractionDigits.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Group" : {
+               "file" : "SOAP/WSDL/XSD/Group.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Length" : {
+               "file" : "SOAP/WSDL/XSD/Length.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::MaxExclusive" : {
+               "file" : "SOAP/WSDL/XSD/MaxExclusive.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::MaxInclusive" : {
+               "file" : "SOAP/WSDL/XSD/MaxInclusive.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::MaxLength" : {
+               "file" : "SOAP/WSDL/XSD/MaxLength.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::MinExclusive" : {
+               "file" : "SOAP/WSDL/XSD/MinExclusive.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::MinInclusive" : {
+               "file" : "SOAP/WSDL/XSD/MinInclusive.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::MinLength" : {
+               "file" : "SOAP/WSDL/XSD/MinLength.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Pattern" : {
+               "file" : "SOAP/WSDL/XSD/Pattern.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Schema" : {
+               "file" : "SOAP/WSDL/XSD/Schema.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Schema::Builtin" : {
+               "file" : "SOAP/WSDL/XSD/Schema/Builtin.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::SimpleType" : {
+               "file" : "SOAP/WSDL/XSD/SimpleType.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::TotalDigits" : {
+               "file" : "SOAP/WSDL/XSD/TotalDigits.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Typelib::Attribute" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Attribute.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Typelib::AttributeSet" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/AttributeSet.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::ENTITY" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::ID" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/ID.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::IDREF" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/IDREF.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::IDREFS" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/IDREFS.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::NCName" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NCName.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKEN" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NMTOKEN.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKENS" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NMTOKENS.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::NOTATION" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NOTATION.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::Name" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/Name.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::QName" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/QName.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/anySimpleType.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::anyType" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/anyType.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::anyURI" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/anyURI.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::base64Binary" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/base64Binary.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::boolean" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/boolean.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::byte" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/byte.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::date" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/date.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::dateTime" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/dateTime.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::decimal" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/decimal.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::double" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/double.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::duration" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/duration.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::float" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/float.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::gDay" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gDay.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::gMonth" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gMonth.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::gMonthDay" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gMonthDay.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::gYear" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gYear.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::gYearMonth" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gYearMonth.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::hexBinary" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/hexBinary.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::int" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/int.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::integer" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/integer.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::language" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/language.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::list" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/list.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::long" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/long.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::negativeInteger" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/negativeInteger.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/nonNegativeInteger.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::nonPositiveInteger" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/nonPositiveInteger.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::normalizedString" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/normalizedString.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::positiveInteger" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/positiveInteger.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::short" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/short.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::string" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/string.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::time" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/time.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::token" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/token.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedByte.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedInt.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedLong.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::Builtin::unsignedShort" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.pm"
+            },
+            "SOAP::WSDL::XSD::Typelib::ComplexType" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/ComplexType.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Typelib::Element" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/Element.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Typelib::SimpleType" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/SimpleType.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::Typelib::SimpleType::restriction" : {
+               "file" : "SOAP/WSDL/XSD/Typelib/SimpleType.pm",
+               "version" : "v2.0.10"
+            },
+            "SOAP::WSDL::XSD::WhiteSpace" : {
+               "file" : "SOAP/WSDL/XSD/WhiteSpace.pm",
+               "version" : "v2.0.10"
+            }
+         },
+         "version" : "v2.0.10"
+      },
       "SQL::Abstract" : {
          "dist" : "SQL-Abstract-1.72",
          "module" : "SQL::Abstract",
@@ -22385,6 +24274,57 @@
          },
          "version" : "1.4"
       },
+      "String::CamelCase" : {
+         "dist" : "String-CamelCase-0.02",
+         "module" : "String::CamelCase",
+         "mymeta" : {
+            "abstract" : "camelcase, de-camelcase",
+            "author" : [
+               "YAMASHINA Hio <hio@cpan.org>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "ExtUtils::MY_Metafile version 0.09, EUMM-6.17., CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "perl_5"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "String-CamelCase",
+            "no_index" : {
+               "directory" : [
+                  "inc",
+                  "t"
+               ]
+            },
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {
+                     "Test::More" : 0
+                  }
+               }
+            },
+            "release_status" : "stable",
+            "version" : "0.02",
+            "x_installdirs" : "site",
+            "x_version_from" : "lib/String/CamelCase.pm"
+         },
+         "name" : "String::CamelCase",
+         "pathname" : "H/HI/HIO/String-CamelCase-0.02.tar.gz",
+         "provides" : {
+            "String::CamelCase" : {
+               "file" : "String/CamelCase.pm",
+               "version" : "0.02"
+            }
+         },
+         "version" : "0.02"
+      },
       "String::RewritePrefix" : {
          "dist" : "String-RewritePrefix-0.006",
          "module" : "String::RewritePrefix",
@@ -22617,6 +24557,89 @@
          },
          "version" : "0.006"
       },
+      "String::ToIdentifier::EN" : {
+         "dist" : "String-ToIdentifier-EN-0.07",
+         "module" : "String::ToIdentifier::EN",
+         "mymeta" : {
+            "abstract" : "Convert Strings to English Program Identifiers",
+            "author" : [
+               "Rafael Kitover, C<< <rkitover@cpan.org> >>",
+               "Rafael Kitover <rkitover@cpan.org>"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "Module::Install version 1.04, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "perl_5"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "String-ToIdentifier-EN",
+            "no_index" : {
+               "directory" : [
+                  "inc",
+                  "t"
+               ]
+            },
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : "6.62",
+                     "Test::More" : "0.92"
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : "6.62"
+                  }
+               },
+               "runtime" : {
+                  "requires" : {
+                     "Exporter" : "5.57",
+                     "Lingua::EN::Inflect::Phrase" : "0.07",
+                     "Test::More" : "0.92",
+                     "Text::Unidecode" : "0.04",
+                     "namespace::clean" : "0.20",
+                     "perl" : "5.008001"
+                  }
+               }
+            },
+            "provides" : {
+               "String::ToIdentifier::EN" : {
+                  "file" : "lib/String/ToIdentifier/EN.pm",
+                  "version" : "0.07"
+               },
+               "String::ToIdentifier::EN::Unicode" : {
+                  "file" : "lib/String/ToIdentifier/EN/Unicode.pm",
+                  "version" : 0
+               }
+            },
+            "release_status" : "stable",
+            "resources" : {
+               "license" : [
+                  "http://dev.perl.org/licenses/"
+               ],
+               "repository" : {
+                  "type" : "git",
+                  "url" : "git://github.com/rkitover/string-toidentifier-en.git"
+               }
+            },
+            "version" : "0.07"
+         },
+         "name" : "String::ToIdentifier::EN",
+         "pathname" : "R/RK/RKITOVER/String-ToIdentifier-EN-0.07.tar.gz",
+         "provides" : {
+            "String::ToIdentifier::EN" : {
+               "file" : "String/ToIdentifier/EN.pm",
+               "version" : "0.07"
+            },
+            "String::ToIdentifier::EN::Unicode" : {
+               "file" : "String/ToIdentifier/EN/Unicode.pm"
+            }
+         },
+         "version" : "0.07"
+      },
       "Sub::Exporter" : {
          "dist" : "Sub-Exporter-0.982",
          "module" : "Sub::Exporter",
@@ -23347,6 +25370,58 @@
          },
          "version" : "1.00"
       },
+      "Term::ReadKey" : {
+         "dist" : "TermReadKey-2.30",
+         "module" : "Term::ReadKey",
+         "mymeta" : {
+            "abstract" : "unknown",
+            "author" : [
+               "unknown"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "unknown"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "TermReadKey",
+            "no_index" : {
+               "directory" : [
+                  "t",
+                  "inc"
+               ]
+            },
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {}
+               }
+            },
+            "release_status" : "stable",
+            "version" : "2.30"
+         },
+         "name" : "Term::ReadKey",
+         "pathname" : "J/JS/JSTOWE/TermReadKey-2.30.tar.gz",
+         "provides" : {
+            "Term::ReadKey" : {
+               "file" : "Term/ReadKey.pm",
+               "version" : "2.30"
+            }
+         },
+         "version" : "2.30"
+      },
       "Test::Base" : {
          "dist" : "Test-Base-0.60",
          "module" : "Test::Base",
@@ -24883,6 +26958,82 @@
          },
          "version" : "0.02"
       },
+      "Text::German" : {
+         "dist" : "Text-German-0.06",
+         "module" : "Text::German",
+         "mymeta" : {
+            "abstract" : "unknown",
+            "author" : [
+               "unknown"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "unknown"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "Text-German",
+            "no_index" : {
+               "directory" : [
+                  "t",
+                  "inc"
+               ]
+            },
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {}
+               }
+            },
+            "release_status" : "stable",
+            "version" : "0.06"
+         },
+         "name" : "Text::German",
+         "pathname" : "U/UL/ULPFR/Text-German-0.06.tar.gz",
+         "provides" : {
+            "Text::German" : {
+               "file" : "Text/German.pm",
+               "version" : "0.06"
+            },
+            "Text::German::Adjektiv" : {
+               "file" : "Text/German/Adjektiv.pm"
+            },
+            "Text::German::Ausnahme" : {
+               "file" : "Text/German/Ausnahme.pm"
+            },
+            "Text::German::Cache" : {
+               "file" : "Text/German/Cache.pm"
+            },
+            "Text::German::Endung" : {
+               "file" : "Text/German/Endung.pm"
+            },
+            "Text::German::Regel" : {
+               "file" : "Text/German/Regel.pm"
+            },
+            "Text::German::Util" : {
+               "file" : "Text/German/Util.pm"
+            },
+            "Text::German::Verb" : {
+               "file" : "Text/German/Verb.pm"
+            },
+            "Text::German::Vorsilbe" : {
+               "file" : "Text/German/Vorsilbe.pm"
+            }
+         },
+         "version" : "0.06"
+      },
       "Text::Glob" : {
          "dist" : "Text-Glob-0.09",
          "module" : "Text::Glob",
@@ -25046,6 +27197,58 @@
          },
          "version" : "1.45"
       },
+      "Text::Unidecode" : {
+         "dist" : "Text-Unidecode-0.04",
+         "module" : "Text::Unidecode",
+         "mymeta" : {
+            "abstract" : "unknown",
+            "author" : [
+               "unknown"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "unknown"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "Text-Unidecode",
+            "no_index" : {
+               "directory" : [
+                  "t",
+                  "inc"
+               ]
+            },
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : 0
+                  }
+               },
+               "runtime" : {
+                  "requires" : {}
+               }
+            },
+            "release_status" : "stable",
+            "version" : "0.04"
+         },
+         "name" : "Text::Unidecode",
+         "pathname" : "S/SB/SBURKE/Text-Unidecode-0.04.tar.gz",
+         "provides" : {
+            "Text::Unidecode" : {
+               "file" : "Text/Unidecode.pm",
+               "version" : "0.04"
+            }
+         },
+         "version" : "0.04"
+      },
       "Tie::IxHash" : {
          "dist" : "Tie-IxHash-1.22",
          "module" : "Tie::IxHash",
@@ -26362,216 +28565,6 @@
          },
          "version" : "1.11"
       },
-      "XML::Parser" : {
-         "dist" : "XML-Parser-2.41",
-         "module" : "XML::Parser",
-         "mymeta" : {
-            "abstract" : "A perl module for parsing XML documents",
-            "author" : [
-               "Clark Cooper (coopercc@netheaven.com)"
-            ],
-            "dynamic_config" : 0,
-            "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150",
-            "license" : [
-               "perl_5"
-            ],
-            "meta-spec" : {
-               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-               "version" : "2"
-            },
-            "name" : "XML-Parser",
-            "no_index" : {
-               "directory" : [
-                  "t",
-                  "inc"
-               ]
-            },
-            "prereqs" : {
-               "build" : {
-                  "requires" : {
-                     "ExtUtils::MakeMaker" : 0
-                  }
-               },
-               "configure" : {
-                  "requires" : {
-                     "ExtUtils::MakeMaker" : 0
-                  }
-               },
-               "runtime" : {
-                  "requires" : {
-                     "LWP" : 0,
-                     "perl" : "5.00405"
-                  }
-               }
-            },
-            "release_status" : "stable",
-            "resources" : {
-               "repository" : {
-                  "url" : "http://github.com/chorny/XML-Parser"
-               }
-            },
-            "version" : "2.41"
-         },
-         "name" : "XML::Parser",
-         "pathname" : "T/TO/TODDR/XML-Parser-2.41.tar.gz",
-         "provides" : {
-            "XML::Parser" : {
-               "file" : "XML/Parser.pm",
-               "version" : "2.41"
-            },
-            "XML::Parser::Expat" : {
-               "file" : "XML/Parser/Expat.pm",
-               "version" : "2.41"
-            },
-            "XML::Parser::Style::Debug" : {
-               "file" : "XML/Parser/Style/Debug.pm"
-            },
-            "XML::Parser::Style::Objects" : {
-               "file" : "XML/Parser/Style/Objects.pm"
-            },
-            "XML::Parser::Style::Stream" : {
-               "file" : "XML/Parser/Style/Stream.pm"
-            },
-            "XML::Parser::Style::Subs" : {
-               "file" : "XML/Parser/Style/Subs.pm"
-            },
-            "XML::Parser::Style::Tree" : {
-               "file" : "XML/Parser/Style/Tree.pm"
-            }
-         },
-         "version" : "2.41"
-      },
-      "XML::RSS" : {
-         "dist" : "XML-RSS-1.49",
-         "module" : "XML::RSS",
-         "mymeta" : {
-            "abstract" : "creates and updates RSS files",
-            "author" : [
-               "Shlomi Fish <shlomif@cpan.org>"
-            ],
-            "dynamic_config" : 0,
-            "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150",
-            "keywords" : [
-               "feed",
-               "feeds",
-               "generate",
-               "generating",
-               "parse",
-               "parsing",
-               "rss",
-               "RSS",
-               "web-feed",
-               "web-feeds",
-               "xml"
-            ],
-            "license" : [
-               "perl_5"
-            ],
-            "meta-spec" : {
-               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-               "version" : "2"
-            },
-            "name" : "XML-RSS",
-            "prereqs" : {
-               "build" : {
-                  "requires" : {
-                     "Test::Manifest" : "0.9",
-                     "Test::More" : 0
-                  }
-               },
-               "configure" : {
-                  "requires" : {
-                     "Module::Build" : "0.36"
-                  }
-               },
-               "runtime" : {
-                  "requires" : {
-                     "DateTime" : 0,
-                     "DateTime::Format::Mail" : 0,
-                     "DateTime::Format::W3CDTF" : 0,
-                     "HTML::Entities" : 0,
-                     "XML::Parser" : "2.23",
-                     "perl" : "5.008"
-                  }
-               }
-            },
-            "provides" : {
-               "XML::RSS" : {
-                  "file" : "lib/XML/RSS.pm",
-                  "version" : "1.49"
-               },
-               "XML::RSS::Private::Output::Base" : {
-                  "file" : "lib/XML/RSS/Private/Output/Base.pm",
-                  "version" : 0
-               },
-               "XML::RSS::Private::Output::Roles::ImageDims" : {
-                  "file" : "lib/XML/RSS/Private/Output/Roles/ImageDims.pm",
-                  "version" : 0
-               },
-               "XML::RSS::Private::Output::Roles::ModulesElems" : {
-                  "file" : "lib/XML/RSS/Private/Output/Roles/ModulesElems.pm",
-                  "version" : 0
-               },
-               "XML::RSS::Private::Output::V0_9" : {
-                  "file" : "lib/XML/RSS/Private/Output/V0_9.pm",
-                  "version" : 0
-               },
-               "XML::RSS::Private::Output::V0_91" : {
-                  "file" : "lib/XML/RSS/Private/Output/V0_91.pm",
-                  "version" : 0
-               },
-               "XML::RSS::Private::Output::V1_0" : {
-                  "file" : "lib/XML/RSS/Private/Output/V1_0.pm",
-                  "version" : 0
-               },
-               "XML::RSS::Private::Output::V2_0" : {
-                  "file" : "lib/XML/RSS/Private/Output/V2_0.pm",
-                  "version" : 0
-               }
-            },
-            "release_status" : "stable",
-            "resources" : {
-               "homepage" : "http://perl-rss.sourceforge.net/",
-               "license" : [
-                  "http://dev.perl.org/licenses/"
-               ],
-               "repository" : {
-                  "url" : "https://svn.perl.org/modules/XML-RSS/trunk"
-               }
-            },
-            "version" : "1.49"
-         },
-         "name" : "XML::RSS",
-         "pathname" : "S/SH/SHLOMIF/XML-RSS-1.49.tar.gz",
-         "provides" : {
-            "XML::RSS" : {
-               "file" : "XML/RSS.pm",
-               "version" : "1.49"
-            },
-            "XML::RSS::Private::Output::Base" : {
-               "file" : "XML/RSS/Private/Output/Base.pm"
-            },
-            "XML::RSS::Private::Output::Roles::ImageDims" : {
-               "file" : "XML/RSS/Private/Output/Roles/ImageDims.pm"
-            },
-            "XML::RSS::Private::Output::Roles::ModulesElems" : {
-               "file" : "XML/RSS/Private/Output/Roles/ModulesElems.pm"
-            },
-            "XML::RSS::Private::Output::V0_9" : {
-               "file" : "XML/RSS/Private/Output/V0_9.pm"
-            },
-            "XML::RSS::Private::Output::V0_91" : {
-               "file" : "XML/RSS/Private/Output/V0_91.pm"
-            },
-            "XML::RSS::Private::Output::V1_0" : {
-               "file" : "XML/RSS/Private/Output/V1_0.pm"
-            },
-            "XML::RSS::Private::Output::V2_0" : {
-               "file" : "XML/RSS/Private/Output/V2_0.pm"
-            }
-         },
-         "version" : "1.49"
-      },
       "XML::SAX" : {
          "dist" : "XML-SAX-0.99",
          "module" : "XML::SAX",
@@ -27051,6 +29044,130 @@
          },
          "version" : "0.30"
       },
+      "carton" : {
+         "dist" : "carton-v0.9.3",
+         "module" : "Carton",
+         "mymeta" : {
+            "abstract" : "unknown",
+            "author" : [
+               "Tatsuhiko Miyagawa"
+            ],
+            "dynamic_config" : 0,
+            "generated_by" : "Module::Install version 1.03, CPAN::Meta::Converter version 2.112150",
+            "license" : [
+               "perl_5"
+            ],
+            "meta-spec" : {
+               "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+               "version" : "2"
+            },
+            "name" : "carton",
+            "no_index" : {
+               "directory" : [
+                  "inc",
+                  "t",
+                  "xt"
+               ]
+            },
+            "prereqs" : {
+               "build" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : "6.62",
+                     "Test::More" : "0.88",
+                     "Test::Requires" : 0,
+                     "version" : "0.77"
+                  }
+               },
+               "configure" : {
+                  "requires" : {
+                     "ExtUtils::MakeMaker" : "6.59",
+                     "version" : "0.77"
+                  }
+               },
+               "runtime" : {
+                  "requires" : {
+                     "App::cpanminus" : "1.5",
+                     "CPAN::Meta" : "2.112",
+                     "Exception::Class" : "1.32",
+                     "ExtUtils::MakeMaker" : "6.59",
+                     "JSON" : "2.53",
+                     "Module::Build" : "0.38",
+                     "Module::Metadata" : "1.000003",
+                     "Term::ANSIColor" : "1.12",
+                     "Try::Tiny" : "0.09",
+                     "local::lib" : "1.008",
+                     "parent" : "0.223",
+                     "perl" : "5.008001"
+                  }
+               }
+            },
+            "provides" : {
+               "Carton" : {
+                  "file" : "lib/Carton.pm",
+                  "version" : "v0.9.3"
+               },
+               "Carton::CLI" : {
+                  "file" : "lib/Carton/CLI.pm",
+                  "version" : 0
+               },
+               "Carton::Error" : {
+                  "file" : "lib/Carton/Error.pm",
+                  "version" : 0
+               },
+               "Carton::Tree" : {
+                  "file" : "lib/Carton/Tree.pm",
+                  "version" : 0
+               },
+               "Carton::TreeNode" : {
+                  "file" : "lib/Carton/Tree.pm",
+                  "version" : 0
+               },
+               "Carton::Util" : {
+                  "file" : "lib/Carton/Util.pm",
+                  "version" : 0
+               }
+            },
+            "release_status" : "stable",
+            "resources" : {
+               "bugtracker" : {
+                  "web" : "https://github.com/miyagawa/carton/issues"
+               },
+               "homepage" : "https://github.com/miyagawa/carton",
+               "license" : [
+                  "http://dev.perl.org/licenses/"
+               ],
+               "repository" : {
+                  "type" : "git",
+                  "url" : "git://github.com/miyagawa/carton.git"
+               }
+            },
+            "version" : "v0.9.3"
+         },
+         "name" : "carton",
+         "pathname" : "M/MI/MIYAGAWA/carton-v0.9.3.tar.gz",
+         "provides" : {
+            "Carton" : {
+               "file" : "Carton.pm",
+               "version" : "v0.9.3"
+            },
+            "Carton::CLI" : {
+               "file" : "Carton/CLI.pm"
+            },
+            "Carton::Error" : {
+               "file" : "Carton/Error.pm"
+            },
+            "Carton::Tree" : {
+               "file" : "Carton/Tree.pm"
+            },
+            "Carton::TreeNode" : {
+               "file" : "Carton/Tree.pm"
+            },
+            "Carton::Util" : {
+               "file" : "Carton/Util.pm"
+            }
+         },
+         "version" : "v0.9.3"
+      },
       "local::lib" : {
          "dist" : "local-lib-1.008004",
          "module" : "local::lib",
diff --git a/commonlib b/commonlib
-Subproject 4c2e8e4d8b27aa043d5aa120622a659b56f494d
+Subproject f81ec03692fac90792fc102f88f0afbf3d2f73b
diff --git a/conf/crontab.ugly b/conf/crontab.ugly
index f7a08b163..087021fd1 100644
--- a/conf/crontab.ugly
+++ b/conf/crontab.ugly
@@ -22,7 +22,7 @@ MAILTO=!!(*= $user *)!!@mysociety.org
 #2 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-alerts.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-alerts" || echo "stalled?"
 0,30 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-questionnaires.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-questionnaires" || echo "stalled?"
 
-!!(* } elsif (($vhost eq 'www.fixmystreet.com') || ($vhost eq 'matthew.fixmystreet.com')|| ($vhost eq 'bromley.test.mysociety.org') ) { *)!!
+!!(* } elsif (($vhost eq 'www.fixmystreet.com') || ($vhost eq 'bromley.test.mysociety.org') || ($vhost eq 'integration-staging.fixmystreet.com')) { *)!!
 5,10,15,20,25,30,35,40,45,50,55 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-reports" || echo "stalled?"
 0 0-8,10,11,13,14,16,17,19-23 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-reports" || echo "stalled?"
 0 9,12,15,18 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-reports --verbose" || echo "stalled?"
@@ -42,6 +42,7 @@ MAILTO=!!(*= $user *)!!@mysociety.org
 43 2 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/problem-creation-graph
 00 8 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/check-for-zombies !!(*= $user *)!!
 
+
 !!(* if ($vhost eq 'www.fixmystreet.com') { *)!!
 10 * * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet-virtualenv/bin/python /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/kasabi
 !!(* } *)!!
diff --git a/conf/httpd.conf-example b/conf/httpd.conf-example
index c1b6d96c2..e7900161e 100644
--- a/conf/httpd.conf-example
+++ b/conf/httpd.conf-example
@@ -67,6 +67,7 @@ ExpiresByType text/css "access plus 10 years"
 ExpiresByType application/javascript "access plus 10 years"
 <Location /js/>
     AddOutputFilter DEFLATE js
+    Header append Cache-Control "no-transform"
 </Location>
 
 # Don't want jslib being passed to Catalyst
diff --git a/conf/packages b/conf/packages
index 21ee0a862..bc87d73be 100644..120000
--- a/conf/packages
+++ b/conf/packages
@@ -1,37 +1 @@
-jhead
-libdatetime-format-w3cdtf-perl
-libcache-memcached-perl
-libdbd-pg-perl
-libdbi-perl
-libdigest-sha1-perl
-liberror-perl
-libfcgi-perl
-libfile-slurp-perl
-libgeography-nationalgrid-perl
-libhtml-parser-perl
-libio-string-perl
-liblingua-en-inflect-perl
-liblocale-gettext-perl
-libsoap-lite-perl
-libstatistics-distributions-perl
-liburi-perl
-libwww-perl
-libxml-rss-perl
-memcached
-perl
-perl-base
-perl-modules
-perlmagick
-libjson-perl
-libimage-size-perl
-libmath-bigint-gmp-perl
-gettext
-libtest-exception-perl
-libipc-run3-perl
-libyaml-perl
-liblist-moreutils-perl
-ruby-compass | libhaml-ruby
-libtemplate-perl
-postgresql-server-dev-8.4
-gnuplot
-ttf-bitstream-vera
+packages.debian-squeeze
+\ No newline at end of file
diff --git a/conf/packages.debian-squeeze b/conf/packages.debian-squeeze
new file mode 100644
index 000000000..cb494157d
--- /dev/null
+++ b/conf/packages.debian-squeeze
@@ -0,0 +1,38 @@
+jhead
+libdatetime-format-w3cdtf-perl
+libcache-memcached-perl
+libdbd-pg-perl
+libdbi-perl
+libdigest-sha1-perl
+liberror-perl
+libfcgi-perl
+libfile-slurp-perl
+libgeography-nationalgrid-perl
+libhtml-parser-perl
+libio-string-perl
+liblingua-en-inflect-perl
+liblocale-gettext-perl
+libsoap-lite-perl
+libstatistics-distributions-perl
+liburi-perl
+libwww-perl
+libxml-rss-perl
+memcached
+perl
+perl-base
+perl-modules
+perlmagick
+libjson-perl
+libimage-size-perl
+libmath-bigint-gmp-perl
+gettext
+libtest-exception-perl
+libipc-run3-perl
+libyaml-perl
+liblist-moreutils-perl
+libhaml-ruby
+libtemplate-perl
+postgresql-8.4
+postgresql-server-dev-8.4
+gnuplot
+ttf-bitstream-vera
diff --git a/db/schema.sql b/db/schema.sql
index 13f992749..832104991 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -195,7 +195,10 @@ create table problem (
     -- logging sending failures (used by webservices)
     send_fail_count integer not null default 0, 
     send_fail_reason text, 
-    send_fail_timestamp timestamp
+    send_fail_timestamp timestamp,
+    
+    -- record send_method used, which can be used to infer usefulness of external_id
+    send_method_used text
 );
 create index problem_state_latitude_longitude_idx on problem(state, latitude, longitude);
 create index problem_user_id_idx on problem ( user_id );
diff --git a/db/schema_0015-add_send_method_used_column_to_problem.sql b/db/schema_0015-add_send_method_used_column_to_problem.sql
new file mode 100644
index 000000000..0c6e0851d
--- /dev/null
+++ b/db/schema_0015-add_send_method_used_column_to_problem.sql
@@ -0,0 +1,6 @@
+begin;
+
+ALTER table problem
+    ADD column send_method_used text; 
+
+commit;
diff --git a/notes/INSTALL.pod b/notes/INSTALL.pod
index b795a0043..701112b45 100644
--- a/notes/INSTALL.pod
+++ b/notes/INSTALL.pod
@@ -13,6 +13,11 @@ following command from inside the fixmystreet directory:
 
     git submodule update --init
 
+If you're using git version 1.6.5 or later, you can do those steps in
+one go with:
+
+    git clone --recursive https://github.com/mysociety/fixmystreet.git
+
 =head1 REQUIREMENTS
 
 On the server you are installing FixMyStreet on you will need the following things:
@@ -50,17 +55,24 @@ to CSS convertor. You can get one from L<http://sass-lang.com/>
 
 If you're expecting a lot of traffic it's recommended that you install memcached: L<http://memcached.org/>
 
-If you're using a Debian based Linux distribution then the packages to install
-some required dependencies (though not all the required Perl modules) are
-listed in C<conf/packages>. To install all of them you can run:
+If you're using Debian 6.0 ("squeeze") then the packages to install
+some required dependencies (though not all the required Perl modules)
+are listed in C<conf/packages.debian-squeeze>. To install all of them
+you can run:
 
-    xargs -a conf/packages apt-get install
+    sudo xargs -a conf/packages.debian-squeeze apt-get install
 
-Note, you will need to either be logged in as root or to use
+A similar list of packages should work for other Debian-based
+distributions.  (Please let us know if you would like to contribute
+such a package list or instructions for other distributions.)
 
-    sudo xargs -a conf/packages apt-get install
+To generate the CSS for the current design of FixMyStreet you will
+also need Compass L<http://compass-style.org/>, but unfortunately
+it is not packaged in Debian squeeze (or squeeze-backports).  You
+will either need to install the package from testing, or you could
+install it from the Ruby gem with:
 
-for this to work.
+    gem install compass
 
 =head2 Service dependencies
 
@@ -81,22 +93,70 @@ geolocation services.
 
 =head1 DETAILED INSTALLATION INSTRUCTIONS
 
-=head2 Unpacking the Code
-
-Once you've downloaded the code you should unpack it. The best place to do this
-is in the location you want the web server vhost to be.
-
 =head2 Creating the database
 
-The default settings file assumes the database is called fms and the user the same. 
+The default settings file (C<conf/general.yml>) assumes the database is called fms and the user the same.
 You can change these if you like.
 
+If you wish to create this new database and database user with
+password authentication, the following steps may help.  First, create
+the fms user:
+
+    $ sudo -u postgres createuser fms
+    Shall the new role be a superuser? (y/n) n
+    Shall the new role be allowed to create databases? (y/n) n
+    Shall the new role be allowed to create more new roles? (y/n) n
+
+Then create the fms database:
+
+    $ sudo -u postgres createdb fms
+
+Set the password of the fms user, and change the owner of the fms database to be the fms user:
+
+    $ sudo -u postgres psql
+    postgres=# ALTER USER fms WITH PASSWORD 'somepassword'
+    ALTER ROLE
+    postgres=# ALTER DATABASE fms OWNER to fms;
+    ALTER DATABASE
+    postgres=# \q
+    $
+
+Then you need to configure PostgreSQL to allow password-based access
+to the fms database as the user fms from using Unix-domain sockets.
+Edit the file C</etc/postgresql/8.4/main/pg_hba.conf> and add as the
+first line:
+
+    local   fms     fms     md5
+
+You will then need to restart PostgreSQL with:
+
+    $ sudo /etc/init.d/postgresql restart
+
+If you want to access the database from the command line, you can add
+the following line to C<~/.pgpass>:
+
+    localhost:*:fms:fms:somepassword
+
+Then you should be able to access the database with:
+
+    $ psql -U fms fms
+
 =head2 Set up the database
 
-Once you've created the database you can use the sql in C<db/schema.sql> to create the required
+Before creating the database schema, you will need to install the
+PostgreSQL's SQL procedural language into the database:
+
+    createlang -U fms plpgsql fms
+
+Now you can use the sql in C<db/schema.sql> to create the required
 tables, triggers and stored procedures. You will also need to run
-C<db/alert_types.sql> which
-populates the alert_types table.
+C<db/alert_types.sql> which populates the alert_types table.  For
+example, you might run:
+
+    $ psql -U fms fms < db/schema.sql
+    ...
+    $ psql -U fms fms < db/alert_types.sql
+    ...
 
 =head2 Install Perl modules
 
@@ -105,7 +165,7 @@ C<bin/install_perl_modules> script, so run that now. This will install them
 into a directory called local.
 
 It uses cpanminus and Carton under the hood but should install these
-of they are missing. You may need to install some source packages to
+if they are missing. You may need to install some source packages to
 allow some of the included modules to be built, including:
 
 =over
@@ -130,6 +190,21 @@ the required development tools.
 
 =head2 Set up Webserver
 
+For production use of FixMyStreet, we suggest you use Apache and
+FastCGI.  (See below.)  For local development, however, you can use
+the Catalyst development server.  First, install the Catalyst
+development tools with:
+
+    ./bin/cron-wrapper local/bin/carton install Catalyst::Devel
+
+Then the development server can be run with:
+
+     CATALYST_DEBUG=1 ./bin/cron-wrapper ./script/fixmystreet_app_server.pl -r
+
+The server will be accessible as L<http://localhost:3000/>.
+
+=head3 Setting up Apache
+
 It is recommended that you run FixMyStreet using FastCGI. It should also be
 possible to run it using Plack/PSGI.
 
diff --git a/notes/code_structure.txt b/notes/code_structure.txt
index 8c01fba8b..c90db1784 100644
--- a/notes/code_structure.txt
+++ b/notes/code_structure.txt
@@ -3,7 +3,7 @@ The code is broken down into the following sections:
 website: code to display the website and handle user submissions
 
 backend: send alerts to the councils, work out who should get the alert, various
-confirmtaion emails
+confirmation emails
 
 mobile apps: currently for iPhone and Android - two separate apps
 
diff --git a/notes/states.txt b/notes/states.txt
index b885b252b..70515c41b 100644
--- a/notes/states.txt
+++ b/notes/states.txt
@@ -2,13 +2,13 @@ Problems exist in four broad state categories:
     unconfirmed - the report has been made but the user hasn't clicked
 the confirmation link.
     open - the report has been confirmed
-    fixed - exactly what it says
+    fixed - any user has marked this problem as fixed
     closed - a registered user from a council has marked the problem as
 closed
 
 When a problem is created it will be unconfirmed, The problem
 becomes confirmed when the user clicks on the link sent to them in
-the confirmation email. At this point the problem is confirmed.
+the confirmation email. 
 
 If a problem is uploaded from a mobile app then it is initally 
 created with a state of partial.
@@ -17,7 +17,7 @@ If a user is logged in then any problem they create is confirmed
 automatically.
 
 If a council user is logged in then they can change the state of the 
-problem to one of the following provifing they are from the council that
+problem to one of the following, providing they are from the council that
 the problem has been reported to:
     Open ( a synonym for confirmed )
     Investigating
diff --git a/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE.pm b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE.pm
new file mode 100644
index 000000000..2c398ab1b
--- /dev/null
+++ b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE.pm
@@ -0,0 +1,248 @@
+
+package BarnetElements::Z_CRM_SERVICE_ORDER_CREATE;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' }
+
+__PACKAGE__->__set_name('Z_CRM_SERVICE_ORDER_CREATE');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ET_RETURN_of :ATTR(:get<ET_RETURN>);
+my %IT_PROBLEM_DESC_of :ATTR(:get<IT_PROBLEM_DESC>);
+my %IV_CUST_EMAIL_of :ATTR(:get<IV_CUST_EMAIL>);
+my %IV_CUST_NAME_of :ATTR(:get<IV_CUST_NAME>);
+my %IV_KBID_of :ATTR(:get<IV_KBID>);
+my %IV_PROBLEM_ID_of :ATTR(:get<IV_PROBLEM_ID>);
+my %IV_PROBLEM_LOC_of :ATTR(:get<IV_PROBLEM_LOC>);
+my %IV_PROBLEM_SUB_of :ATTR(:get<IV_PROBLEM_SUB>);
+
+__PACKAGE__->_factory(
+    [ qw(        ET_RETURN
+        IT_PROBLEM_DESC
+        IV_CUST_EMAIL
+        IV_CUST_NAME
+        IV_KBID
+        IV_PROBLEM_ID
+        IV_PROBLEM_LOC
+        IV_PROBLEM_SUB
+
+    ) ],
+    {
+        'ET_RETURN' => \%ET_RETURN_of,
+        'IT_PROBLEM_DESC' => \%IT_PROBLEM_DESC_of,
+        'IV_CUST_EMAIL' => \%IV_CUST_EMAIL_of,
+        'IV_CUST_NAME' => \%IV_CUST_NAME_of,
+        'IV_KBID' => \%IV_KBID_of,
+        'IV_PROBLEM_ID' => \%IV_PROBLEM_ID_of,
+        'IV_PROBLEM_LOC' => \%IV_PROBLEM_LOC_of,
+        'IV_PROBLEM_SUB' => \%IV_PROBLEM_SUB_of,
+    },
+    {
+        'ET_RETURN' => 'BarnetTypes::TABLE_OF_BAPIRET2',
+        'IT_PROBLEM_DESC' => 'BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT',
+        'IV_CUST_EMAIL' => 'BarnetTypes::char241',
+        'IV_CUST_NAME' => 'BarnetTypes::char50',
+        'IV_KBID' => 'BarnetTypes::char50',
+        'IV_PROBLEM_ID' => 'BarnetTypes::char35',
+        'IV_PROBLEM_LOC' => 'BarnetTypes::BAPI_TTET_ADDRESS_COM',
+        'IV_PROBLEM_SUB' => 'BarnetTypes::char40',
+    },
+    {
+
+        'ET_RETURN' => 'ET_RETURN',
+        'IT_PROBLEM_DESC' => 'IT_PROBLEM_DESC',
+        'IV_CUST_EMAIL' => 'IV_CUST_EMAIL',
+        'IV_CUST_NAME' => 'IV_CUST_NAME',
+        'IV_KBID' => 'IV_KBID',
+        'IV_PROBLEM_ID' => 'IV_PROBLEM_ID',
+        'IV_PROBLEM_LOC' => 'IV_PROBLEM_LOC',
+        'IV_PROBLEM_SUB' => 'IV_PROBLEM_SUB',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+BarnetElements::Z_CRM_SERVICE_ORDER_CREATE
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Z_CRM_SERVICE_ORDER_CREATE from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ET_RETURN
+
+ $element->set_ET_RETURN($data);
+ $element->get_ET_RETURN();
+
+
+
+
+=item * IT_PROBLEM_DESC
+
+ $element->set_IT_PROBLEM_DESC($data);
+ $element->get_IT_PROBLEM_DESC();
+
+
+
+
+=item * IV_CUST_EMAIL
+
+ $element->set_IV_CUST_EMAIL($data);
+ $element->get_IV_CUST_EMAIL();
+
+
+
+
+=item * IV_CUST_NAME
+
+ $element->set_IV_CUST_NAME($data);
+ $element->get_IV_CUST_NAME();
+
+
+
+
+=item * IV_KBID
+
+ $element->set_IV_KBID($data);
+ $element->get_IV_KBID();
+
+
+
+
+=item * IV_PROBLEM_ID
+
+ $element->set_IV_PROBLEM_ID($data);
+ $element->get_IV_PROBLEM_ID();
+
+
+
+
+=item * IV_PROBLEM_LOC
+
+ $element->set_IV_PROBLEM_LOC($data);
+ $element->get_IV_PROBLEM_LOC();
+
+
+
+
+=item * IV_PROBLEM_SUB
+
+ $element->set_IV_PROBLEM_SUB($data);
+ $element->get_IV_PROBLEM_SUB();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = BarnetElements::Z_CRM_SERVICE_ORDER_CREATE->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ET_RETURN =>  { # BarnetTypes::TABLE_OF_BAPIRET2
+     item =>  { # BarnetTypes::BAPIRET2
+       TYPE => $some_value, # char1
+       ID => $some_value, # char20
+       NUMBER => $some_value, # numeric3
+       MESSAGE => $some_value, # char220
+       LOG_NO => $some_value, # char20
+       LOG_MSG_NO => $some_value, # numeric6
+       MESSAGE_V1 => $some_value, # char50
+       MESSAGE_V2 => $some_value, # char50
+       MESSAGE_V3 => $some_value, # char50
+       MESSAGE_V4 => $some_value, # char50
+       PARAMETER => $some_value, # char32
+       ROW =>  $some_value, # int
+       FIELD => $some_value, # char30
+       SYSTEM => $some_value, # char10
+     },
+   },
+   IT_PROBLEM_DESC =>  { # BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT
+     item =>  { # BarnetTypes::CRMT_SERVICE_REQUEST_TEXT
+       TEXT_LINE => $some_value, # char132
+     },
+   },
+   IV_CUST_EMAIL => $some_value, # char241
+   IV_CUST_NAME => $some_value, # char50
+   IV_KBID => $some_value, # char50
+   IV_PROBLEM_ID => $some_value, # char35
+   IV_PROBLEM_LOC =>  { # BarnetTypes::BAPI_TTET_ADDRESS_COM
+     COUNTRY2 => $some_value, # char2
+     REGION => $some_value, # char3
+     COUNTY => $some_value, # char30
+     CITY => $some_value, # char30
+     POSTALCODE => $some_value, # char10
+     STREET => $some_value, # char30
+     STREETNUMBER => $some_value, # char5
+     GEOCODE => $some_value, # char32
+   },
+   IV_PROBLEM_SUB => $some_value, # char40
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE/Exception.pm b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE/Exception.pm
new file mode 100644
index 000000000..ae95d3234
--- /dev/null
+++ b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE/Exception.pm
@@ -0,0 +1,64 @@
+
+package BarnetElements::Z_CRM_SERVICE_ORDER_CREATE::Exception;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' }
+
+__PACKAGE__->__set_name('Z_CRM_SERVICE_ORDER_CREATE.Exception');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcException
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+BarnetElements::Z_CRM_SERVICE_ORDER_CREATE::Exception
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Z_CRM_SERVICE_ORDER_CREATE.Exception from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = BarnetElements::Z_CRM_SERVICE_ORDER_CREATE::Exception->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcException
+   Name => $some_value, # Z_CRM_SERVICE_ORDER_CREATE.RfcExceptions
+   Text =>  $some_value, # string
+   Message =>  { # BarnetTypes::RfcException::Message
+     ID =>  $some_value, # string
+     Number => $some_value, # RfcException.Message.Number
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATEResponse.pm b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATEResponse.pm
new file mode 100644
index 000000000..5755d0b49
--- /dev/null
+++ b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATEResponse.pm
@@ -0,0 +1,183 @@
+
+package BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' }
+
+__PACKAGE__->__set_name('Z_CRM_SERVICE_ORDER_CREATEResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ET_RETURN_of :ATTR(:get<ET_RETURN>);
+my %EV_ORDER_GUID_of :ATTR(:get<EV_ORDER_GUID>);
+my %EV_ORDER_NO_of :ATTR(:get<EV_ORDER_NO>);
+my %IT_PROBLEM_DESC_of :ATTR(:get<IT_PROBLEM_DESC>);
+
+__PACKAGE__->_factory(
+    [ qw(        ET_RETURN
+        EV_ORDER_GUID
+        EV_ORDER_NO
+        IT_PROBLEM_DESC
+
+    ) ],
+    {
+        'ET_RETURN' => \%ET_RETURN_of,
+        'EV_ORDER_GUID' => \%EV_ORDER_GUID_of,
+        'EV_ORDER_NO' => \%EV_ORDER_NO_of,
+        'IT_PROBLEM_DESC' => \%IT_PROBLEM_DESC_of,
+    },
+    {
+        'ET_RETURN' => 'BarnetTypes::TABLE_OF_BAPIRET2',
+        'EV_ORDER_GUID' => 'BarnetTypes::char32',
+        'EV_ORDER_NO' => 'BarnetTypes::char10',
+        'IT_PROBLEM_DESC' => 'BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT',
+    },
+    {
+
+        'ET_RETURN' => 'ET_RETURN',
+        'EV_ORDER_GUID' => 'EV_ORDER_GUID',
+        'EV_ORDER_NO' => 'EV_ORDER_NO',
+        'IT_PROBLEM_DESC' => 'IT_PROBLEM_DESC',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Z_CRM_SERVICE_ORDER_CREATEResponse from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ET_RETURN
+
+ $element->set_ET_RETURN($data);
+ $element->get_ET_RETURN();
+
+
+
+
+=item * EV_ORDER_GUID
+
+ $element->set_EV_ORDER_GUID($data);
+ $element->get_EV_ORDER_GUID();
+
+
+
+
+=item * EV_ORDER_NO
+
+ $element->set_EV_ORDER_NO($data);
+ $element->get_EV_ORDER_NO();
+
+
+
+
+=item * IT_PROBLEM_DESC
+
+ $element->set_IT_PROBLEM_DESC($data);
+ $element->get_IT_PROBLEM_DESC();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ET_RETURN =>  { # BarnetTypes::TABLE_OF_BAPIRET2
+     item =>  { # BarnetTypes::BAPIRET2
+       TYPE => $some_value, # char1
+       ID => $some_value, # char20
+       NUMBER => $some_value, # numeric3
+       MESSAGE => $some_value, # char220
+       LOG_NO => $some_value, # char20
+       LOG_MSG_NO => $some_value, # numeric6
+       MESSAGE_V1 => $some_value, # char50
+       MESSAGE_V2 => $some_value, # char50
+       MESSAGE_V3 => $some_value, # char50
+       MESSAGE_V4 => $some_value, # char50
+       PARAMETER => $some_value, # char32
+       ROW =>  $some_value, # int
+       FIELD => $some_value, # char30
+       SYSTEM => $some_value, # char10
+     },
+   },
+   EV_ORDER_GUID => $some_value, # char32
+   EV_ORDER_NO => $some_value, # char10
+   IT_PROBLEM_DESC =>  { # BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT
+     item =>  { # BarnetTypes::CRMT_SERVICE_REQUEST_TEXT
+       TEXT_LINE => $some_value, # char132
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetInterfaces/service/ZLBB_SERVICE_ORDER.pm b/perllib/BarnetInterfaces/service/ZLBB_SERVICE_ORDER.pm
new file mode 100644
index 000000000..94e0cd4db
--- /dev/null
+++ b/perllib/BarnetInterfaces/service/ZLBB_SERVICE_ORDER.pm
@@ -0,0 +1,166 @@
+package BarnetInterfaces::service::ZLBB_SERVICE_ORDER;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable;
+use Scalar::Util qw(blessed);
+use base qw(SOAP::WSDL::Client::Base);
+
+# only load if it hasn't been loaded before
+require BarnetTypemaps::service
+    if not BarnetTypemaps::service->can('get_class');
+
+sub START {
+    $_[0]->set_proxy('http://lbbcrmdev.barnet.gov.uk:8000/sap/bc/srt/rfc/sap/zlbb_service_order/200/zlbb_service_order/zlbb_service_order') if not $_[2]->{proxy};
+    $_[0]->set_class_resolver('BarnetTypemaps::service')
+        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
+}
+
+sub Z_CRM_SERVICE_ORDER_CREATE {
+    my ($self, $body, $header) = @_;
+    die "Z_CRM_SERVICE_ORDER_CREATE must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'Z_CRM_SERVICE_ORDER_CREATE',
+        soap_action => '',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( BarnetElements::Z_CRM_SERVICE_ORDER_CREATE )],
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+
+
+1;
+
+
+
+__END__
+
+=pod
+
+=head1 NAME
+
+BarnetInterfaces::service::ZLBB_SERVICE_ORDER - SOAP Interface for the service Web Service
+
+=head1 SYNOPSIS
+
+ use BarnetInterfaces::service::ZLBB_SERVICE_ORDER;
+ my $interface = BarnetInterfaces::service::ZLBB_SERVICE_ORDER->new();
+
+ my $response;
+ $response = $interface->Z_CRM_SERVICE_ORDER_CREATE();
+
+
+
+=head1 DESCRIPTION
+
+SOAP Interface for the service web service
+located at http://lbbcrmdev.barnet.gov.uk:8000/sap/bc/srt/rfc/sap/zlbb_service_order/200/zlbb_service_order/zlbb_service_order.
+
+=head1 SERVICE service
+
+
+
+=head2 Port ZLBB_SERVICE_ORDER
+
+
+
+=head1 METHODS
+
+=head2 General methods
+
+=head3 new
+
+Constructor.
+
+All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.
+
+=head2 SOAP Service methods
+
+Method synopsis is displayed with hash refs as parameters.
+
+The commented class names in the method's parameters denote that objects
+of the corresponding class can be passed instead of the marked hash ref.
+
+You may pass any combination of objects, hash and list refs to these
+methods, as long as you meet the structure.
+
+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+
+
+
+=head3 Z_CRM_SERVICE_ORDER_CREATE
+
+
+
+Returns a L<BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse|BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse> object.
+
+ $response = $interface->Z_CRM_SERVICE_ORDER_CREATE( {
+    ET_RETURN =>  { # BarnetTypes::TABLE_OF_BAPIRET2
+      item =>  { # BarnetTypes::BAPIRET2
+        TYPE => $some_value, # char1
+        ID => $some_value, # char20
+        NUMBER => $some_value, # numeric3
+        MESSAGE => $some_value, # char220
+        LOG_NO => $some_value, # char20
+        LOG_MSG_NO => $some_value, # numeric6
+        MESSAGE_V1 => $some_value, # char50
+        MESSAGE_V2 => $some_value, # char50
+        MESSAGE_V3 => $some_value, # char50
+        MESSAGE_V4 => $some_value, # char50
+        PARAMETER => $some_value, # char32
+        ROW =>  $some_value, # int
+        FIELD => $some_value, # char30
+        SYSTEM => $some_value, # char10
+      },
+    },
+    IT_PROBLEM_DESC =>  { # BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT
+      item =>  { # BarnetTypes::CRMT_SERVICE_REQUEST_TEXT
+        TEXT_LINE => $some_value, # char132
+      },
+    },
+    IV_CUST_EMAIL => $some_value, # char241
+    IV_CUST_NAME => $some_value, # char50
+    IV_KBID => $some_value, # char50
+    IV_PROBLEM_ID => $some_value, # char35
+    IV_PROBLEM_LOC =>  { # BarnetTypes::BAPI_TTET_ADDRESS_COM
+      COUNTRY2 => $some_value, # char2
+      REGION => $some_value, # char3
+      COUNTY => $some_value, # char30
+      CITY => $some_value, # char30
+      POSTALCODE => $some_value, # char10
+      STREET => $some_value, # char30
+      STREETNUMBER => $some_value, # char5
+      GEOCODE => $some_value, # char32
+    },
+    IV_PROBLEM_SUB => $some_value, # char40
+  },,
+ );
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL on Fri Apr  8 10:23:03 2011
+
+=cut
diff --git a/perllib/BarnetTypemaps/service.pm b/perllib/BarnetTypemaps/service.pm
new file mode 100644
index 000000000..dd9f98162
--- /dev/null
+++ b/perllib/BarnetTypemaps/service.pm
@@ -0,0 +1,103 @@
+
+package BarnetTypemaps::service;
+use strict;
+use warnings;
+
+our $typemap_1 = {
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/EV_ORDER_NO' => 'BarnetTypes::char10',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/GEOCODE' => 'BarnetTypes::char32',
+               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/COUNTRY2' => 'BarnetTypes::char2',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/NUMBER' => 'BarnetTypes::numeric3',
+               'Z_CRM_SERVICE_ORDER_CREATE/IT_PROBLEM_DESC/item' => 'BarnetTypes::CRMT_SERVICE_REQUEST_TEXT',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/MESSAGE_V1' => 'BarnetTypes::char50',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/POSTALCODE' => 'BarnetTypes::char10',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/LOG_NO' => 'BarnetTypes::char20',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/MESSAGE_V2' => 'BarnetTypes::char50',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/MESSAGE_V3' => 'BarnetTypes::char50',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_SUB' => 'BarnetTypes::char40',
+               'Z_CRM_SERVICE_ORDER_CREATE/IT_PROBLEM_DESC/item/TEXT_LINE' => 'BarnetTypes::char132',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/LOG_NO' => 'BarnetTypes::char20',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN' => 'BarnetTypes::TABLE_OF_BAPIRET2',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/ROW' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/IT_PROBLEM_DESC/item' => 'BarnetTypes::CRMT_SERVICE_REQUEST_TEXT',
+               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/PARAMETER' => 'BarnetTypes::char32',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item' => 'BarnetTypes::BAPIRET2',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_CUST_NAME' => 'BarnetTypes::char50',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/MESSAGE_V2' => 'BarnetTypes::char50',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/ROW' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Z_CRM_SERVICE_ORDER_CREATE.Exception/Message/ID' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/IT_PROBLEM_DESC' => 'BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/NUMBER' => 'BarnetTypes::numeric3',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse' => 'BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse',
+               'Z_CRM_SERVICE_ORDER_CREATE.Exception/Text' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/MESSAGE_V1' => 'BarnetTypes::char50',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/PARAMETER' => 'BarnetTypes::char32',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/MESSAGE' => 'BarnetTypes::char220',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/TYPE' => 'BarnetTypes::char1',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/MESSAGE' => 'BarnetTypes::char220',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC' => 'BarnetTypes::BAPI_TTET_ADDRESS_COM',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/TYPE' => 'BarnetTypes::char1',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_CUST_EMAIL' => 'BarnetTypes::char241',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/FIELD' => 'BarnetTypes::char30',
+               'Z_CRM_SERVICE_ORDER_CREATE.Exception/Name' => 'BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcExceptions',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/IT_PROBLEM_DESC/item/TEXT_LINE' => 'BarnetTypes::char132',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/ID' => 'BarnetTypes::char20',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/EV_ORDER_GUID' => 'BarnetTypes::char32',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/SYSTEM' => 'BarnetTypes::char10',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN' => 'BarnetTypes::TABLE_OF_BAPIRET2',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_ID' => 'BarnetTypes::char35',
+               'Z_CRM_SERVICE_ORDER_CREATE' => 'BarnetElements::Z_CRM_SERVICE_ORDER_CREATE',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/REGION' => 'BarnetTypes::char3',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/LOG_MSG_NO' => 'BarnetTypes::numeric6',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/MESSAGE_V4' => 'BarnetTypes::char50',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/FIELD' => 'BarnetTypes::char30',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/SYSTEM' => 'BarnetTypes::char10',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/COUNTY' => 'BarnetTypes::char30',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/LOG_MSG_NO' => 'BarnetTypes::numeric6',
+               'Z_CRM_SERVICE_ORDER_CREATE.Exception/Message' => 'BarnetTypes::RfcException::Message',
+               'Z_CRM_SERVICE_ORDER_CREATE/IT_PROBLEM_DESC' => 'BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT',
+               'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item' => 'BarnetTypes::BAPIRET2',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/CITY' => 'BarnetTypes::char30',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/MESSAGE_V4' => 'BarnetTypes::char50',
+               'Z_CRM_SERVICE_ORDER_CREATE.Exception' => 'BarnetElements::Z_CRM_SERVICE_ORDER_CREATE::Exception',
+               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/STREETNUMBER' => 'BarnetTypes::char5',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/ID' => 'BarnetTypes::char20',
+               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/STREET' => 'BarnetTypes::char30',
+               'Z_CRM_SERVICE_ORDER_CREATE.Exception/Message/Number' => 'BarnetTypes::RfcException::Message::Number',
+               'Z_CRM_SERVICE_ORDER_CREATE/IV_KBID' => 'BarnetTypes::char50',
+               'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/MESSAGE_V3' => 'BarnetTypes::char50'
+             };
+;
+
+sub get_class {
+  my $name = join '/', @{ $_[1] };
+  return $typemap_1->{ $name };
+}
+
+sub get_typemap {
+    return $typemap_1;
+}
+
+1;
+
+__END__
+
+__END__
+
+=pod
+
+=head1 NAME
+
+BarnetTypemaps::service - typemap for service
+
+=head1 DESCRIPTION
+
+Typemap created by SOAP::WSDL for map-based SOAP message parsers.
+
+=cut
+
diff --git a/perllib/BarnetTypes/BAPIRET2.pm b/perllib/BarnetTypes/BAPIRET2.pm
new file mode 100644
index 000000000..2ca20894c
--- /dev/null
+++ b/perllib/BarnetTypes/BAPIRET2.pm
@@ -0,0 +1,219 @@
+package BarnetTypes::BAPIRET2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TYPE_of :ATTR(:get<TYPE>);
+my %ID_of :ATTR(:get<ID>);
+my %NUMBER_of :ATTR(:get<NUMBER>);
+my %MESSAGE_of :ATTR(:get<MESSAGE>);
+my %LOG_NO_of :ATTR(:get<LOG_NO>);
+my %LOG_MSG_NO_of :ATTR(:get<LOG_MSG_NO>);
+my %MESSAGE_V1_of :ATTR(:get<MESSAGE_V1>);
+my %MESSAGE_V2_of :ATTR(:get<MESSAGE_V2>);
+my %MESSAGE_V3_of :ATTR(:get<MESSAGE_V3>);
+my %MESSAGE_V4_of :ATTR(:get<MESSAGE_V4>);
+my %PARAMETER_of :ATTR(:get<PARAMETER>);
+my %ROW_of :ATTR(:get<ROW>);
+my %FIELD_of :ATTR(:get<FIELD>);
+my %SYSTEM_of :ATTR(:get<SYSTEM>);
+
+__PACKAGE__->_factory(
+    [ qw(        TYPE
+        ID
+        NUMBER
+        MESSAGE
+        LOG_NO
+        LOG_MSG_NO
+        MESSAGE_V1
+        MESSAGE_V2
+        MESSAGE_V3
+        MESSAGE_V4
+        PARAMETER
+        ROW
+        FIELD
+        SYSTEM
+
+    ) ],
+    {
+        'TYPE' => \%TYPE_of,
+        'ID' => \%ID_of,
+        'NUMBER' => \%NUMBER_of,
+        'MESSAGE' => \%MESSAGE_of,
+        'LOG_NO' => \%LOG_NO_of,
+        'LOG_MSG_NO' => \%LOG_MSG_NO_of,
+        'MESSAGE_V1' => \%MESSAGE_V1_of,
+        'MESSAGE_V2' => \%MESSAGE_V2_of,
+        'MESSAGE_V3' => \%MESSAGE_V3_of,
+        'MESSAGE_V4' => \%MESSAGE_V4_of,
+        'PARAMETER' => \%PARAMETER_of,
+        'ROW' => \%ROW_of,
+        'FIELD' => \%FIELD_of,
+        'SYSTEM' => \%SYSTEM_of,
+    },
+    {
+        'TYPE' => 'BarnetTypes::char1',
+        'ID' => 'BarnetTypes::char20',
+        'NUMBER' => 'BarnetTypes::numeric3',
+        'MESSAGE' => 'BarnetTypes::char220',
+        'LOG_NO' => 'BarnetTypes::char20',
+        'LOG_MSG_NO' => 'BarnetTypes::numeric6',
+        'MESSAGE_V1' => 'BarnetTypes::char50',
+        'MESSAGE_V2' => 'BarnetTypes::char50',
+        'MESSAGE_V3' => 'BarnetTypes::char50',
+        'MESSAGE_V4' => 'BarnetTypes::char50',
+        'PARAMETER' => 'BarnetTypes::char32',
+        'ROW' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'FIELD' => 'BarnetTypes::char30',
+        'SYSTEM' => 'BarnetTypes::char10',
+    },
+    {
+
+        'TYPE' => 'TYPE',
+        'ID' => 'ID',
+        'NUMBER' => 'NUMBER',
+        'MESSAGE' => 'MESSAGE',
+        'LOG_NO' => 'LOG_NO',
+        'LOG_MSG_NO' => 'LOG_MSG_NO',
+        'MESSAGE_V1' => 'MESSAGE_V1',
+        'MESSAGE_V2' => 'MESSAGE_V2',
+        'MESSAGE_V3' => 'MESSAGE_V3',
+        'MESSAGE_V4' => 'MESSAGE_V4',
+        'PARAMETER' => 'PARAMETER',
+        'ROW' => 'ROW',
+        'FIELD' => 'FIELD',
+        'SYSTEM' => 'SYSTEM',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+BarnetTypes::BAPIRET2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BAPIRET2 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TYPE
+
+
+=item * ID
+
+
+=item * NUMBER
+
+
+=item * MESSAGE
+
+
+=item * LOG_NO
+
+
+=item * LOG_MSG_NO
+
+
+=item * MESSAGE_V1
+
+
+=item * MESSAGE_V2
+
+
+=item * MESSAGE_V3
+
+
+=item * MESSAGE_V4
+
+
+=item * PARAMETER
+
+
+=item * ROW
+
+
+=item * FIELD
+
+
+=item * SYSTEM
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # BarnetTypes::BAPIRET2
+   TYPE => $some_value, # char1
+   ID => $some_value, # char20
+   NUMBER => $some_value, # numeric3
+   MESSAGE => $some_value, # char220
+   LOG_NO => $some_value, # char20
+   LOG_MSG_NO => $some_value, # numeric6
+   MESSAGE_V1 => $some_value, # char50
+   MESSAGE_V2 => $some_value, # char50
+   MESSAGE_V3 => $some_value, # char50
+   MESSAGE_V4 => $some_value, # char50
+   PARAMETER => $some_value, # char32
+   ROW =>  $some_value, # int
+   FIELD => $some_value, # char30
+   SYSTEM => $some_value, # char10
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/BAPI_TTET_ADDRESS_COM.pm b/perllib/BarnetTypes/BAPI_TTET_ADDRESS_COM.pm
new file mode 100644
index 000000000..b4a8b00ca
--- /dev/null
+++ b/perllib/BarnetTypes/BAPI_TTET_ADDRESS_COM.pm
@@ -0,0 +1,165 @@
+package BarnetTypes::BAPI_TTET_ADDRESS_COM;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %COUNTRY2_of :ATTR(:get<COUNTRY2>);
+my %REGION_of :ATTR(:get<REGION>);
+my %COUNTY_of :ATTR(:get<COUNTY>);
+my %CITY_of :ATTR(:get<CITY>);
+my %POSTALCODE_of :ATTR(:get<POSTALCODE>);
+my %STREET_of :ATTR(:get<STREET>);
+my %STREETNUMBER_of :ATTR(:get<STREETNUMBER>);
+my %GEOCODE_of :ATTR(:get<GEOCODE>);
+
+__PACKAGE__->_factory(
+    [ qw(        COUNTRY2
+        REGION
+        COUNTY
+        CITY
+        POSTALCODE
+        STREET
+        STREETNUMBER
+        GEOCODE
+
+    ) ],
+    {
+        'COUNTRY2' => \%COUNTRY2_of,
+        'REGION' => \%REGION_of,
+        'COUNTY' => \%COUNTY_of,
+        'CITY' => \%CITY_of,
+        'POSTALCODE' => \%POSTALCODE_of,
+        'STREET' => \%STREET_of,
+        'STREETNUMBER' => \%STREETNUMBER_of,
+        'GEOCODE' => \%GEOCODE_of,
+    },
+    {
+        'COUNTRY2' => 'BarnetTypes::char2',
+        'REGION' => 'BarnetTypes::char3',
+        'COUNTY' => 'BarnetTypes::char30',
+        'CITY' => 'BarnetTypes::char30',
+        'POSTALCODE' => 'BarnetTypes::char10',
+        'STREET' => 'BarnetTypes::char30',
+        'STREETNUMBER' => 'BarnetTypes::char5',
+        'GEOCODE' => 'BarnetTypes::char32',
+    },
+    {
+
+        'COUNTRY2' => 'COUNTRY2',
+        'REGION' => 'REGION',
+        'COUNTY' => 'COUNTY',
+        'CITY' => 'CITY',
+        'POSTALCODE' => 'POSTALCODE',
+        'STREET' => 'STREET',
+        'STREETNUMBER' => 'STREETNUMBER',
+        'GEOCODE' => 'GEOCODE',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+BarnetTypes::BAPI_TTET_ADDRESS_COM
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BAPI_TTET_ADDRESS_COM from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * COUNTRY2
+
+
+=item * REGION
+
+
+=item * COUNTY
+
+
+=item * CITY
+
+
+=item * POSTALCODE
+
+
+=item * STREET
+
+
+=item * STREETNUMBER
+
+
+=item * GEOCODE
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # BarnetTypes::BAPI_TTET_ADDRESS_COM
+   COUNTRY2 => $some_value, # char2
+   REGION => $some_value, # char3
+   COUNTY => $some_value, # char30
+   CITY => $some_value, # char30
+   POSTALCODE => $some_value, # char10
+   STREET => $some_value, # char30
+   STREETNUMBER => $some_value, # char5
+   GEOCODE => $some_value, # char32
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/CRMT_SERVICE_REQUEST_TEXT.pm b/perllib/BarnetTypes/CRMT_SERVICE_REQUEST_TEXT.pm
new file mode 100644
index 000000000..39e2ad1ce
--- /dev/null
+++ b/perllib/BarnetTypes/CRMT_SERVICE_REQUEST_TEXT.pm
@@ -0,0 +1,102 @@
+package BarnetTypes::CRMT_SERVICE_REQUEST_TEXT;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TEXT_LINE_of :ATTR(:get<TEXT_LINE>);
+
+__PACKAGE__->_factory(
+    [ qw(        TEXT_LINE
+
+    ) ],
+    {
+        'TEXT_LINE' => \%TEXT_LINE_of,
+    },
+    {
+        'TEXT_LINE' => 'BarnetTypes::char132',
+    },
+    {
+
+        'TEXT_LINE' => 'TEXT_LINE',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+BarnetTypes::CRMT_SERVICE_REQUEST_TEXT
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CRMT_SERVICE_REQUEST_TEXT from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TEXT_LINE
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # BarnetTypes::CRMT_SERVICE_REQUEST_TEXT
+   TEXT_LINE => $some_value, # char132
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/RfcException/Message.pm b/perllib/BarnetTypes/RfcException/Message.pm
new file mode 100644
index 000000000..71b94bf7c
--- /dev/null
+++ b/perllib/BarnetTypes/RfcException/Message.pm
@@ -0,0 +1,111 @@
+package BarnetTypes::RfcException::Message;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ID_of :ATTR(:get<ID>);
+my %Number_of :ATTR(:get<Number>);
+
+__PACKAGE__->_factory(
+    [ qw(        ID
+        Number
+
+    ) ],
+    {
+        'ID' => \%ID_of,
+        'Number' => \%Number_of,
+    },
+    {
+        'ID' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Number' => 'BarnetTypes::RfcException::Message::Number',
+    },
+    {
+
+        'ID' => 'ID',
+        'Number' => 'Number',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+BarnetTypes::RfcException::Message
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RfcException.Message from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ID
+
+
+=item * Number
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # BarnetTypes::RfcException::Message
+   ID =>  $some_value, # string
+   Number => $some_value, # RfcException.Message.Number
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/RfcException/Message/Number.pm b/perllib/BarnetTypes/RfcException/Message/Number.pm
new file mode 100644
index 000000000..9353df454
--- /dev/null
+++ b/perllib/BarnetTypes/RfcException/Message/Number.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::RfcException::Message::Number;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RfcException.Message.Number from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/TABLE_OF_BAPIRET2.pm b/perllib/BarnetTypes/TABLE_OF_BAPIRET2.pm
new file mode 100644
index 000000000..c248bc907
--- /dev/null
+++ b/perllib/BarnetTypes/TABLE_OF_BAPIRET2.pm
@@ -0,0 +1,117 @@
+package BarnetTypes::TABLE_OF_BAPIRET2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %item_of :ATTR(:get<item>);
+
+__PACKAGE__->_factory(
+    [ qw(        item
+
+    ) ],
+    {
+        'item' => \%item_of,
+    },
+    {
+        'item' => 'BarnetTypes::BAPIRET2',
+    },
+    {
+
+        'item' => 'item',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+BarnetTypes::TABLE_OF_BAPIRET2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TABLE_OF_BAPIRET2 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * item
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # BarnetTypes::TABLE_OF_BAPIRET2
+   item =>  { # BarnetTypes::BAPIRET2
+     TYPE => $some_value, # char1
+     ID => $some_value, # char20
+     NUMBER => $some_value, # numeric3
+     MESSAGE => $some_value, # char220
+     LOG_NO => $some_value, # char20
+     LOG_MSG_NO => $some_value, # numeric6
+     MESSAGE_V1 => $some_value, # char50
+     MESSAGE_V2 => $some_value, # char50
+     MESSAGE_V3 => $some_value, # char50
+     MESSAGE_V4 => $some_value, # char50
+     PARAMETER => $some_value, # char32
+     ROW =>  $some_value, # int
+     FIELD => $some_value, # char30
+     SYSTEM => $some_value, # char10
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/TABLE_OF_CRMT_SERVICE_REQUEST_TEXT.pm b/perllib/BarnetTypes/TABLE_OF_CRMT_SERVICE_REQUEST_TEXT.pm
new file mode 100644
index 000000000..62eb7b774
--- /dev/null
+++ b/perllib/BarnetTypes/TABLE_OF_CRMT_SERVICE_REQUEST_TEXT.pm
@@ -0,0 +1,104 @@
+package BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %item_of :ATTR(:get<item>);
+
+__PACKAGE__->_factory(
+    [ qw(        item
+
+    ) ],
+    {
+        'item' => \%item_of,
+    },
+    {
+        'item' => 'BarnetTypes::CRMT_SERVICE_REQUEST_TEXT',
+    },
+    {
+
+        'item' => 'item',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TABLE_OF_CRMT_SERVICE_REQUEST_TEXT from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * item
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT
+   item =>  { # BarnetTypes::CRMT_SERVICE_REQUEST_TEXT
+     TEXT_LINE => $some_value, # char132
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcException.pm b/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcException.pm
new file mode 100644
index 000000000..8d04adf53
--- /dev/null
+++ b/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcException.pm
@@ -0,0 +1,123 @@
+package BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcException;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Text_of :ATTR(:get<Text>);
+my %Message_of :ATTR(:get<Message>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        Text
+        Message
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'Text' => \%Text_of,
+        'Message' => \%Message_of,
+    },
+    {
+        'Name' => 'BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcExceptions',
+        'Text' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Message' => 'BarnetTypes::RfcException::Message',
+    },
+    {
+
+        'Name' => 'Name',
+        'Text' => 'Text',
+        'Message' => 'Message',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcException
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Z_CRM_SERVICE_ORDER_CREATE.RfcException from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * Text
+
+
+=item * Message
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcException
+   Name => $some_value, # Z_CRM_SERVICE_ORDER_CREATE.RfcExceptions
+   Text =>  $some_value, # string
+   Message =>  { # BarnetTypes::RfcException::Message
+     ID =>  $some_value, # string
+     Number => $some_value, # RfcException.Message.Number
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcExceptions.pm b/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcExceptions.pm
new file mode 100644
index 000000000..ffc2237bc
--- /dev/null
+++ b/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcExceptions.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcExceptions;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Z_CRM_SERVICE_ORDER_CREATE.RfcExceptions from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char1.pm b/perllib/BarnetTypes/char1.pm
new file mode 100644
index 000000000..d0bab8e5e
--- /dev/null
+++ b/perllib/BarnetTypes/char1.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char1;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char1 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char10.pm b/perllib/BarnetTypes/char10.pm
new file mode 100644
index 000000000..6ff454e4b
--- /dev/null
+++ b/perllib/BarnetTypes/char10.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char10;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char10 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char132.pm b/perllib/BarnetTypes/char132.pm
new file mode 100644
index 000000000..46a41077b
--- /dev/null
+++ b/perllib/BarnetTypes/char132.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char132;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char132 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char2.pm b/perllib/BarnetTypes/char2.pm
new file mode 100644
index 000000000..35c476fbe
--- /dev/null
+++ b/perllib/BarnetTypes/char2.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char2;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char2 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char20.pm b/perllib/BarnetTypes/char20.pm
new file mode 100644
index 000000000..1c2df092a
--- /dev/null
+++ b/perllib/BarnetTypes/char20.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char20;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char20 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char220.pm b/perllib/BarnetTypes/char220.pm
new file mode 100644
index 000000000..7ccde81f8
--- /dev/null
+++ b/perllib/BarnetTypes/char220.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char220;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char220 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char241.pm b/perllib/BarnetTypes/char241.pm
new file mode 100644
index 000000000..e6567554f
--- /dev/null
+++ b/perllib/BarnetTypes/char241.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char241;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char241 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char3.pm b/perllib/BarnetTypes/char3.pm
new file mode 100644
index 000000000..f9d001cda
--- /dev/null
+++ b/perllib/BarnetTypes/char3.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char3;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char3 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char30.pm b/perllib/BarnetTypes/char30.pm
new file mode 100644
index 000000000..91d98eb30
--- /dev/null
+++ b/perllib/BarnetTypes/char30.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char30;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char30 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char32.pm b/perllib/BarnetTypes/char32.pm
new file mode 100644
index 000000000..c5efdaabd
--- /dev/null
+++ b/perllib/BarnetTypes/char32.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char32;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char32 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char35.pm b/perllib/BarnetTypes/char35.pm
new file mode 100644
index 000000000..40aef3d7a
--- /dev/null
+++ b/perllib/BarnetTypes/char35.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char35;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char35 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char40.pm b/perllib/BarnetTypes/char40.pm
new file mode 100644
index 000000000..4402875c1
--- /dev/null
+++ b/perllib/BarnetTypes/char40.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char40;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char40 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char5.pm b/perllib/BarnetTypes/char5.pm
new file mode 100644
index 000000000..fed108437
--- /dev/null
+++ b/perllib/BarnetTypes/char5.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char5;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char5 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/char50.pm b/perllib/BarnetTypes/char50.pm
new file mode 100644
index 000000000..34e5720d1
--- /dev/null
+++ b/perllib/BarnetTypes/char50.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::char50;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+char50 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/numeric3.pm b/perllib/BarnetTypes/numeric3.pm
new file mode 100644
index 000000000..c473d2866
--- /dev/null
+++ b/perllib/BarnetTypes/numeric3.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::numeric3;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+numeric3 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/BarnetTypes/numeric6.pm b/perllib/BarnetTypes/numeric6.pm
new file mode 100644
index 000000000..b5438c1aa
--- /dev/null
+++ b/perllib/BarnetTypes/numeric6.pm
@@ -0,0 +1,65 @@
+package BarnetTypes::numeric6;
+use strict;
+use warnings;
+
+sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+numeric6 from the namespace urn:sap-com:document:sap:rfc:functions.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index d6f613fd3..bbfa8170f 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -6,6 +6,7 @@ BEGIN { extends 'Catalyst::Controller'; }
 
 use POSIX qw(strftime strcoll);
 use Digest::MD5 qw(md5_hex);
+use mySociety::EmailUtil qw(is_valid_email);
 
 use FixMyStreet::SendReport;
 
@@ -486,17 +487,33 @@ sub search_reports : Path('search_reports') {
         $c->model('DB')->schema->storage->sql_maker->quote_char( '"' );
         $c->model('DB')->schema->storage->sql_maker->name_sep( '.' );
 
+        my $query;
+        if (is_valid_email($search)) {
+            $query = [
+                'user.email' => { ilike => $like_search },
+            ];
+        } elsif ($search =~ /^id:(\d+)$/) {
+            $query = [
+                'me.id' => int($1),
+            ];
+        } elsif ($search =~ /^area:(\d+)$/) {
+            $query = [
+                'me.areas' => { like => "%,$1,%" }
+            ];
+        } else {
+            $query = [
+                'me.id' => $search_n,
+                'user.email' => { ilike => $like_search },
+                'me.name' => { ilike => $like_search },
+                'me.title' => { ilike => $like_search },
+                detail => { ilike => $like_search },
+                council => { like => $like_search },
+                cobrand_data => { like => $like_search },
+            ];
+        }
         my $problems = $c->cobrand->problems->search(
             {
-                -or => [
-                    'me.id' => $search_n,
-                    'user.email' => { ilike => $like_search },
-                    'me.name' => { ilike => $like_search },
-                    'me.title' => { ilike => $like_search },
-                    detail => { ilike => $like_search },
-                    council => { like => $like_search },
-                    cobrand_data => { like => $like_search },
-                ]
+                -or => $query,
             },
             {
                 prefetch => 'user',
@@ -512,26 +529,44 @@ sub search_reports : Path('search_reports') {
         $c->stash->{edit_council_contacts} = 1
             if ( grep {$_ eq 'councilcontacts'} keys %{$c->stash->{allowed_pages}});
 
-        my $updates = $c->model('DB::Comment')->search(
-            {
-                -or => [
-                    'me.id' => $search_n,
-                    'problem.id' => $search_n,
-                    'user.email' => { ilike => $like_search },
-                    'me.name' => { ilike => $like_search },
-                    text => { ilike => $like_search },
-                    'me.cobrand_data' => { ilike => $like_search },
-                    %{ $site_restriction },
-                ]
-            },
-            {
-                -select   => [ 'me.*', qw/problem.council problem.state/ ],
-                prefetch => [qw/user problem/],
-                order_by => [\"(me.state='hidden')",\"(problem.state='hidden')",'me.created']
-            }
-        );
+        if (is_valid_email($search)) {
+            $query = [
+                'user.email' => { ilike => $like_search },
+                %{ $site_restriction },
+            ];
+        } elsif ($search =~ /^id:(\d+)$/) {
+            $query = [
+                'me.id' => int($1),
+                'problem.id' => int($1),
+                %{ $site_restriction },
+            ];
+        } elsif ($search =~ /^area:(\d+)$/) {
+            $query = [];
+        } else {
+            $query = [
+                'me.id' => $search_n,
+                'problem.id' => $search_n,
+                'user.email' => { ilike => $like_search },
+                'me.name' => { ilike => $like_search },
+                text => { ilike => $like_search },
+                'me.cobrand_data' => { ilike => $like_search },
+                %{ $site_restriction },
+            ];
+        }
 
-        $c->stash->{updates} = [ $updates->all ];
+        if (@$query) {
+            my $updates = $c->model('DB::Comment')->search(
+                {
+                    -or => $query,
+                },
+                {
+                    -select   => [ 'me.*', qw/problem.council problem.state/ ],
+                    prefetch => [qw/user problem/],
+                    order_by => [\"(me.state='hidden')",\"(problem.state='hidden')",'me.created']
+                }
+            );
+            $c->stash->{updates} = [ $updates->all ];
+        }
 
         # Switch quoting back off. See above for explanation of this.
         $c->model('DB')->schema->storage->sql_maker->quote_char( '' );
diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm
index c54bad238..5d5832b08 100644
--- a/perllib/FixMyStreet/App/Controller/Photo.pm
+++ b/perllib/FixMyStreet/App/Controller/Photo.pm
@@ -114,6 +114,7 @@ sub _shrink {
     $image->BlobToImage($photo);
     my $err = $image->Scale(geometry => "$size>");
     throw Error::Simple("resize failed: $err") if "$err";
+    $image->Strip();
     my @blobs = $image->ImageToBlob();
     undef $image;
     return $blobs[0];
@@ -129,6 +130,7 @@ sub _crop {
     throw Error::Simple("resize failed: $err") if "$err";
     $err = $image->Extent( geometry => '90x60', gravity => 'Center' );
     throw Error::Simple("resize failed: $err") if "$err";
+    $image->Strip();
     my @blobs = $image->ImageToBlob();
     undef $image;
     return $blobs[0];
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index e7468986b..4dac4d30f 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -78,6 +78,8 @@ partial
 
 =cut
 
+use constant COUNCIL_ID_BARNET => 2489;
+
 sub report_new : Path : Args(0) {
     my ( $self, $c ) = @_;
 
@@ -556,9 +558,15 @@ sub setup_categories_and_councils : Private {
     } elsif ($first_council->{id} != 2482 && $first_council->{type} eq 'LBO') {
 
         $area_ids_to_list{ $first_council->{id} } = 1;
+        my @local_categories;
+        if ($first_council->{id} == COUNCIL_ID_BARNET) {
+            @local_categories =  sort(keys %{ Utils::barnet_categories() }); # removed 'Other' option
+        } else {
+            @local_categories =  sort keys %{ Utils::london_categories() }            
+        }
         @category_options = (
             _('-- Pick a category --'),
-            sort keys %{ Utils::london_categories() }
+            @local_categories 
         );
         $category_label = _('Category');
 
@@ -747,8 +755,15 @@ sub process_report : Private {
         $councils = join( ',', @{ $c->stash->{area_ids_to_list} } ) || -1;
         $report->council( $councils );
 
-    } elsif ( $first_council->{id} != 2482 && $first_council->{type} eq 'LBO') {
+    } elsif ( $first_council->{id} == COUNCIL_ID_BARNET ) {
 
+        unless ( exists Utils::barnet_categories()->{ $report->category } or $report->category eq 'Other') {
+            $c->stash->{field_errors}->{category} = _('Please choose a category');
+        }
+        $report->council( $first_council->{id} );
+        
+    } elsif ( $first_council->{id} != 2482 && $first_council->{type} eq 'LBO') {
+        
         unless ( Utils::london_categories()->{ $report->category } ) {
             $c->stash->{field_errors}->{category} = _('Please choose a category');
         }
diff --git a/perllib/FixMyStreet/App/Controller/Static.pm b/perllib/FixMyStreet/App/Controller/Static.pm
index 52b230c27..d4b7a1b83 100755
--- a/perllib/FixMyStreet/App/Controller/Static.pm
+++ b/perllib/FixMyStreet/App/Controller/Static.pm
@@ -29,6 +29,10 @@ sub for_councils_faq : Path('/for-councils/faq') : Args(0) {
     my ( $self, $c ) = @_;
 }
 
+sub privacy : Global : Args(0) {
+    my ( $self, $c ) = @_;
+}
+
 sub faq : Global : Args(0) {
     my ( $self, $c ) = @_;
 
diff --git a/perllib/FixMyStreet/DB.pm b/perllib/FixMyStreet/DB.pm
index 18c8cc2ca..a1767abe9 100644
--- a/perllib/FixMyStreet/DB.pm
+++ b/perllib/FixMyStreet/DB.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB;
 
 # Created by DBIx::Class::Schema::Loader
@@ -10,8 +11,9 @@ use base 'DBIx::Class::Schema';
 
 __PACKAGE__->load_namespaces;
 
-# Created by DBIx::Class::Schema::Loader v0.07009 @ 2011-03-01 15:43:43
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tJZ+CpaAfZVPrctDXTZTuQ
+
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CjFpUvon7KggFM7OF7VK/w
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
 1;
diff --git a/perllib/FixMyStreet/DB/Result/Abuse.pm b/perllib/FixMyStreet/DB/Result/Abuse.pm
index b1cf9c1ed..e8e554afa 100644
--- a/perllib/FixMyStreet/DB/Result/Abuse.pm
+++ b/perllib/FixMyStreet/DB/Result/Abuse.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::Abuse;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,15 +8,14 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("abuse");
 __PACKAGE__->add_columns("email", { data_type => "text", is_nullable => 0 });
 __PACKAGE__->set_primary_key("email");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:IuTLiJSDZGLF/WX8q3iKIQ
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:PnQhGMx+ktK++3gWOMJBpQ
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
 1;
diff --git a/perllib/FixMyStreet/DB/Result/AdminLog.pm b/perllib/FixMyStreet/DB/Result/AdminLog.pm
index da97950a0..ede786871 100644
--- a/perllib/FixMyStreet/DB/Result/AdminLog.pm
+++ b/perllib/FixMyStreet/DB/Result/AdminLog.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::AdminLog;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,7 +8,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("admin_log");
 __PACKAGE__->add_columns(
@@ -36,8 +36,8 @@ __PACKAGE__->add_columns(
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7427CuN3/6IL2GxiQDoWUA
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+NlSH8U+beRjBZl8CpqK9A
 
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
diff --git a/perllib/FixMyStreet/DB/Result/Alert.pm b/perllib/FixMyStreet/DB/Result/Alert.pm
index eddd98f37..ca9ad45c2 100644
--- a/perllib/FixMyStreet/DB/Result/Alert.pm
+++ b/perllib/FixMyStreet/DB/Result/Alert.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::Alert;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,7 +8,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("alert");
 __PACKAGE__->add_columns(
@@ -24,6 +24,8 @@ __PACKAGE__->add_columns(
   { data_type => "text", is_nullable => 1 },
   "parameter2",
   { data_type => "text", is_nullable => 1 },
+  "user_id",
+  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
   "confirmed",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "lang",
@@ -40,8 +42,6 @@ __PACKAGE__->add_columns(
   },
   "whendisabled",
   { data_type => "timestamp", is_nullable => 1 },
-  "user_id",
-  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
 );
 __PACKAGE__->set_primary_key("id");
 __PACKAGE__->belongs_to(
@@ -50,22 +50,22 @@ __PACKAGE__->belongs_to(
   { ref => "alert_type" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
+__PACKAGE__->has_many(
+  "alerts_sent",
+  "FixMyStreet::DB::Result::AlertSent",
+  { "foreign.alert_id" => "self.id" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
 __PACKAGE__->belongs_to(
   "user",
   "FixMyStreet::DB::Result::User",
   { id => "user_id" },
   { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
 );
-__PACKAGE__->has_many(
-  "alert_sents",
-  "FixMyStreet::DB::Result::AlertSent",
-  { "foreign.alert_id" => "self.id" },
-  { cascade_copy => 0, cascade_delete => 0 },
-);
 
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:d2TrE9UIZdXu3eXYJH0Zmw
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vump36YxUO4FQi5Do6DwvA
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
 
diff --git a/perllib/FixMyStreet/DB/Result/AlertSent.pm b/perllib/FixMyStreet/DB/Result/AlertSent.pm
index a901c2fde..a537c95cd 100644
--- a/perllib/FixMyStreet/DB/Result/AlertSent.pm
+++ b/perllib/FixMyStreet/DB/Result/AlertSent.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::AlertSent;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,7 +8,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("alert_sent");
 __PACKAGE__->add_columns(
@@ -30,8 +30,8 @@ __PACKAGE__->belongs_to(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fTiWIoriQUvHpWc9PpFLvA
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oN+36hDWJuc0hqkCW9BHOw
 
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
diff --git a/perllib/FixMyStreet/DB/Result/AlertType.pm b/perllib/FixMyStreet/DB/Result/AlertType.pm
index d23a2983d..3aa9677e0 100644
--- a/perllib/FixMyStreet/DB/Result/AlertType.pm
+++ b/perllib/FixMyStreet/DB/Result/AlertType.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::AlertType;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,7 +8,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("alert_type");
 __PACKAGE__->add_columns(
@@ -47,8 +47,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+PKqo7IZ4MlM9ur4V2P9tA
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:KDBYzNEAM5lPvZjb9cv22g
 
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index d31bf5510..91695d7d0 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -20,6 +20,10 @@ __PACKAGE__->add_columns(
   },
   "problem_id",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
+  "user_id",
+  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
+  "anonymous",
+  { data_type => "boolean", is_nullable => 0 },
   "name",
   { data_type => "text", is_nullable => 1 },
   "website",
@@ -48,10 +52,6 @@ __PACKAGE__->add_columns(
   { data_type => "boolean", is_nullable => 0 },
   "mark_open",
   { data_type => "boolean", default_value => \"false", is_nullable => 0 },
-  "user_id",
-  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
-  "anonymous",
-  { data_type => "boolean", is_nullable => 0 },
   "problem_state",
   { data_type => "text", is_nullable => 1 },
   "external_id",
diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm
index 941e4e1bb..c32b75d0c 100644
--- a/perllib/FixMyStreet/DB/Result/Contact.pm
+++ b/perllib/FixMyStreet/DB/Result/Contact.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::Contact;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,7 +8,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("contacts");
 __PACKAGE__->add_columns(
@@ -40,8 +40,9 @@ __PACKAGE__->add_columns(
 __PACKAGE__->set_primary_key("id");
 __PACKAGE__->add_unique_constraint("contacts_area_id_category_idx", ["area_id", "category"]);
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-08-01 10:07:59
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4y6yRz4rMN66pBpkzfJJhg
+
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hyvU0bMWSFxEPAJT7wqM/Q
 
 __PACKAGE__->filter_column(
     extra => {
diff --git a/perllib/FixMyStreet/DB/Result/ContactsHistory.pm b/perllib/FixMyStreet/DB/Result/ContactsHistory.pm
index 811a06b44..deb00fb95 100644
--- a/perllib/FixMyStreet/DB/Result/ContactsHistory.pm
+++ b/perllib/FixMyStreet/DB/Result/ContactsHistory.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::ContactsHistory;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,7 +8,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("contacts_history");
 __PACKAGE__->add_columns(
@@ -40,8 +40,8 @@ __PACKAGE__->add_columns(
 __PACKAGE__->set_primary_key("contacts_history_id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9APvBwAOebG5g4MGxJuVKQ
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dN2ueIDoP3d/+Mg1UDqsMw
 
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 854d3bd91..b8aea8697 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::Problem;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,7 +8,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("problem");
 __PACKAGE__->add_columns(
@@ -90,6 +90,8 @@ __PACKAGE__->add_columns(
   { data_type => "text", is_nullable => 1 },
   "send_fail_timestamp",
   { data_type => "timestamp", is_nullable => 1 },
+  "send_method_used",
+  { data_type => "text", is_nullable => 1 },
 );
 __PACKAGE__->set_primary_key("id");
 __PACKAGE__->has_many(
@@ -98,22 +100,22 @@ __PACKAGE__->has_many(
   { "foreign.problem_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
-__PACKAGE__->belongs_to(
-  "user",
-  "FixMyStreet::DB::Result::User",
-  { id => "user_id" },
-  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
-);
 __PACKAGE__->has_many(
   "questionnaires",
   "FixMyStreet::DB::Result::Questionnaire",
   { "foreign.problem_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
+__PACKAGE__->belongs_to(
+  "user",
+  "FixMyStreet::DB::Result::User",
+  { id => "user_id" },
+  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
+);
 
 
-# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-16 10:08:56
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VODeZlWk8l/+IzBBlRNV0A
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-05-03 16:05:20
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EvwI91Ot7SioQWqwnXRTBQ
 
 # Add fake relationship to stored procedure table
 __PACKAGE__->has_one(
@@ -568,7 +570,50 @@ sub body {
     return $body;
 }
 
+# returns true if the external id is the council's ref, i.e., useful to publish it
+# (by way of an example, the barnet send method returns a useful reference when
+# it succeeds, so that is the ref we should show on the problem report page).
+#     Future: this is installation-dependent so maybe should be using the contact
+#             data to determine if the external id is public on a council-by-council basis.
+#     Note:   this only makes sense when called on a problem that has been sent!
+sub can_display_external_id {
+    my $self = shift;
+    if ($self->external_id && $self->send_method_used eq 'barnet') {
+        return 1;
+    }
+    return 0;    
+}
+
 # TODO Some/much of this could be moved to the template
+
+# either: 
+#   "sent to council 3 mins later"
+#   "[Council name] ref: XYZ"
+# or
+#   "sent to council 3 mins later, their ref: XYZ"
+#
+# Note: some silliness with pronouns and the adjacent comma mean this is
+#       being presented as a single string rather than two
+sub processed_summary_string {
+    my ( $problem, $c ) = @_;
+    my ($duration_clause, $external_ref_clause);
+    if ($problem->whensent) {
+        $duration_clause = $problem->duration_string($c)
+    }
+    if ($problem->can_display_external_id) {
+        if ($duration_clause) {
+            $external_ref_clause = sprintf(_('their ref:&nbsp;%s'), $problem->external_id);
+        } else {
+            $external_ref_clause = sprintf(_('%s ref:&nbsp;%s'), $problem->external_body, $problem->external_id);
+        }
+    }
+    if ($duration_clause and $external_ref_clause) {
+        return "$duration_clause, $external_ref_clause"
+    } else { 
+        return $duration_clause || $external_ref_clause
+    }
+}
+
 sub duration_string {
     my ( $problem, $c ) = @_;
     my $body = $problem->body( $c );
diff --git a/perllib/FixMyStreet/DB/Result/Questionnaire.pm b/perllib/FixMyStreet/DB/Result/Questionnaire.pm
index cc4ec300b..b6791603a 100644
--- a/perllib/FixMyStreet/DB/Result/Questionnaire.pm
+++ b/perllib/FixMyStreet/DB/Result/Questionnaire.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::Questionnaire;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,7 +8,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("questionnaire");
 __PACKAGE__->add_columns(
@@ -40,8 +40,8 @@ __PACKAGE__->belongs_to(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QNFqqCg6J4SFlg4zwm7TWw
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NGlSRjoBpDoIvK3EueqN6Q
 
 use DateTime::TimeZone;
 
diff --git a/perllib/FixMyStreet/DB/Result/Secret.pm b/perllib/FixMyStreet/DB/Result/Secret.pm
index 8a1fa671d..449dfec0e 100644
--- a/perllib/FixMyStreet/DB/Result/Secret.pm
+++ b/perllib/FixMyStreet/DB/Result/Secret.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::Secret;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,14 +8,13 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("secret");
 __PACKAGE__->add_columns("secret", { data_type => "text", is_nullable => 0 });
 
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:MfqW1K0aFtwpa/1c/UwHjg
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9XiWSKJ1PD3LSYjrSA3drw
 
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
diff --git a/perllib/FixMyStreet/DB/Result/Session.pm b/perllib/FixMyStreet/DB/Result/Session.pm
index 9d5d509dc..4713c99eb 100644
--- a/perllib/FixMyStreet/DB/Result/Session.pm
+++ b/perllib/FixMyStreet/DB/Result/Session.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::Session;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,7 +8,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("sessions");
 __PACKAGE__->add_columns(
@@ -21,8 +21,8 @@ __PACKAGE__->add_columns(
 __PACKAGE__->set_primary_key("id");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TagSQOXnDttkwfJ7oDH8Yw
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:MVmCn4gLQWXTDIIaDHiVmA
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
 1;
diff --git a/perllib/FixMyStreet/DB/Result/Token.pm b/perllib/FixMyStreet/DB/Result/Token.pm
index 3a900858d..b223ada3a 100644
--- a/perllib/FixMyStreet/DB/Result/Token.pm
+++ b/perllib/FixMyStreet/DB/Result/Token.pm
@@ -1,3 +1,4 @@
+use utf8;
 package FixMyStreet::DB::Result::Token;
 
 # Created by DBIx::Class::Schema::Loader
@@ -7,7 +8,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
 __PACKAGE__->table("token");
 __PACKAGE__->add_columns(
@@ -27,8 +27,8 @@ __PACKAGE__->add_columns(
 __PACKAGE__->set_primary_key("scope", "token");
 
 
-# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:frl+na3HrIzGw9D1t891nA
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+LLZ8P5GXqPetuGyrra2vw
 
 # Trying not to use this
 # use mySociety::DBHandle qw(dbh);
diff --git a/perllib/FixMyStreet/Geocode/Bing.pm b/perllib/FixMyStreet/Geocode/Bing.pm
index 0a7fc38dc..3bbb9dcdc 100644
--- a/perllib/FixMyStreet/Geocode/Bing.pm
+++ b/perllib/FixMyStreet/Geocode/Bing.pm
@@ -71,7 +71,14 @@ sub string {
                );
 
         ( $latitude, $longitude ) = @{ $_->{point}->{coordinates} };
-        push (@$error, { address => $address, latitude => $latitude, longitude => $longitude });
+        # These co-ordinates are output as query parameters in a URL, make sure they have a "."
+        mySociety::Locale::in_gb_locale {
+            push (@$error, {
+                address => $address,
+                latitude => sprintf('%0.6f', $latitude),
+                longitude => sprintf('%0.6f', $longitude)
+            });
+        };
         push (@valid_locations, $_);
     }
 
diff --git a/perllib/FixMyStreet/Geocode/Google.pm b/perllib/FixMyStreet/Geocode/Google.pm
index 83b36dbcd..1ab347066 100644
--- a/perllib/FixMyStreet/Geocode/Google.pm
+++ b/perllib/FixMyStreet/Geocode/Google.pm
@@ -75,7 +75,14 @@ sub string {
         my $address = $_->{address};
         next unless $c->cobrand->geocoded_string_check( $address );
         ( $longitude, $latitude ) = @{ $_->{Point}->{coordinates} };
-        push (@$error, { address => $address, latitude => $latitude, longitude => $longitude });
+        # These co-ordinates are output as query parameters in a URL, make sure they have a "."
+        mySociety::Locale::in_gb_locale {
+            push (@$error, {
+                address => $address,
+                latitude => sprintf('%0.6f', $latitude),
+                longitude => sprintf('%0.6f', $longitude)
+            });
+        };
         push (@valid_locations, $_);
     }
     return { latitude => $latitude, longitude => $longitude } if scalar @valid_locations == 1;
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index a8cbc98f2..7daf01f56 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -151,7 +151,7 @@ sub delete_user {
         ok( $p->delete, "delete problem " . $p->title );
     }
     for my $a ( $user->alerts ) {
-        $a->alert_sents->delete;
+        $a->alerts_sent->delete;
         ok( $a->delete, "delete alert " . $a->alert_type );
     }
     ok( $_->delete, "delete comment " . $_->text )     for $user->comments;
diff --git a/perllib/SOAP/WSDL/Serializer/XSD.pm b/perllib/SOAP/WSDL/Serializer/XSD.pm
new file mode 100644
index 000000000..f233f74e7
--- /dev/null
+++ b/perllib/SOAP/WSDL/Serializer/XSD.pm
@@ -0,0 +1,148 @@
+#!/usr/bin/perl -w
+package SOAP::WSDL::Serializer::XSD;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable;
+use Scalar::Util qw(blessed);
+
+use version; our $VERSION = qv('2.00.10');
+
+use SOAP::WSDL::Factory::Serializer;
+
+my $SOAP_NS = 'http://schemas.xmlsoap.org/soap/envelope/';
+my $XML_INSTANCE_NS = 'http://www.w3.org/2001/XMLSchema-instance';
+
+sub serialize {
+    my ($self, $args_of_ref) = @_;
+
+    my $opt = $args_of_ref->{ options };
+
+    if (not $opt->{ namespace }->{ $SOAP_NS })
+    {
+        $opt->{ namespace }->{ $SOAP_NS } = 'SOAP-ENV';
+    }
+
+    if (not $opt->{ namespace }->{ $XML_INSTANCE_NS })
+    {
+        $opt->{ namespace }->{ $XML_INSTANCE_NS } = 'xsi';
+    }
+
+    my $soap_prefix = $opt->{ namespace }->{ $SOAP_NS };
+
+    # envelope start with namespaces
+    my $xml = "<$soap_prefix\:Envelope ";
+
+    while (my ($uri, $prefix) = each %{ $opt->{ namespace } })
+    {
+        $xml .= "xmlns:$prefix=\"$uri\" ";
+    }
+    #
+    # add namespace for user-supplied prefix if needed
+    $xml .= "xmlns:$opt->{prefix}=\"" . $args_of_ref->{ body }->get_xmlns() . "\" "
+        if $opt->{prefix};
+
+    # TODO insert encoding
+    $xml.='>';
+    $xml .= $self->serialize_header($args_of_ref->{ method }, $args_of_ref->{ header }, $opt);
+    $xml .= $self->serialize_body($args_of_ref->{ method }, $args_of_ref->{ body }, $opt);
+    $xml .= '</' . $soap_prefix .':Envelope>';
+    return $xml;
+}
+
+sub serialize_header {
+    my ($self, $method, $data, $opt) = @_;
+
+    # header is optional. Leave out if there's no header data
+    return q{} if not $data;
+    return join ( q{},
+        "<$opt->{ namespace }->{ $SOAP_NS }\:Header>",
+        blessed $data ? $data->serialize_qualified : (),
+        "</$opt->{ namespace }->{ $SOAP_NS }\:Header>",
+    );
+}
+
+sub serialize_body {
+    my ($self, $method, $data, $opt) = @_;
+
+    # TODO This one wipes out the old class' XML name globally
+    # Fix in some more appropriate place...
+    # $data->__set_name("$opt->{prefix}:" . $data->__get_name() ) if $opt->{prefix};
+    # fix: -------v  from https://rt.cpan.org/Public/Bug/Display.html?id=38035
+    if ( $opt->{prefix} ) {
+       my $body_name = $data->__get_name();
+       $body_name =~ s/.+://;
+       $data->__set_name($opt->{prefix} . ":" . $body_name );
+    }
+    # fix end ----^
+    
+    # Body is NOT optional. Serialize to empty body
+    # if we have no data.
+    return join ( q{},
+        "<$opt->{ namespace }->{ $SOAP_NS }\:Body>",
+        defined $data
+            ? ref $data eq 'ARRAY'
+                ? join q{}, map { blessed $_ ? $_->serialize_qualified() : () } @{ $data }
+                : blessed $data
+                    ? $opt->{prefix}
+                        ? $data->serialize()
+                        : $data->serialize_qualified()
+                    : ()
+            : (),
+        "</$opt->{ namespace }->{ $SOAP_NS }\:Body>",
+    );
+}
+
+__END__
+
+=pod
+
+=head1 NAME
+
+SOAP:WSDL::Serializer::XSD - Serializer for SOAP::WSDL::XSD::Typelib:: objects
+
+=head1 DESCRIPTION
+
+This is the default serializer for SOAP::WSDL::Client and Interface classes
+generated by SOAP::WSDL
+
+It may be used as a template for creating custom serializers.
+
+See L<SOAP::WSDL::Factory::Serializer|SOAP::WSDL::Factory::Serializer> for
+details on that.
+
+=head1 METHODS
+
+=head2 serialize
+
+Creates a SOAP envelope based on the body and header arguments passed.
+
+Sets SOAP namespaces.
+
+=head2 serialize_body
+
+Serializes a message body to XML
+
+=head2 serialize_header
+
+Serializes a message header to XML
+
+=head1 LICENSE AND COPYRIGHT
+
+Copyright (c) 2007 Martin Kutter. All rights reserved.
+
+This file is part of SOAP-WSDL. You may distribute/modify it under
+the same terms as perl itself
+
+=head1 AUTHOR
+
+Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
+
+=head1 REPOSITORY INFORMATION
+
+ $Rev: 851 $
+ $LastChangedBy: kutterma $
+ $Id: XSD.pm 851 2009-05-15 22:45:18Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Serializer/XSD.pm $
+
+=cut
+
diff --git a/perllib/Utils.pm b/perllib/Utils.pm
index 4e64836c6..6a47fd17d 100644
--- a/perllib/Utils.pm
+++ b/perllib/Utils.pm
@@ -140,6 +140,47 @@ sub london_categories {
     };
 }
 
+sub barnet_categories {
+    # The values here are KBIDs from Barnet's system: see bin/send-reports for formatting 
+    if (mySociety::Config::get('STAGING_SITE')) { # note staging site must use different KBIDs
+        return {
+             'Blocked drain'             => 255,  # Gullies-Blocked
+             'Dead animal'               => 286,  # Animals-Dead-Removal
+             'Dog fouling'               => 288,  # Dog Fouling-Clear
+             'Fly tipping'               => 347,  # Fly tipping-Clear
+             'Graffiti'                  => 292,  # Graffiti-Removal
+             'Litter, accumulated'       => 349,  # Accumulated Litter
+             'Litter, overflowing bins'  => 205,  # Litter Bins-Overflowing
+             'Pavements'                 => 195,  # Pavements-Damaged/Cracked
+             'Pothole'                   => 204,  # Pothole
+             'Roads Signs'               => 432,  # Roads Signs - Maintenance
+             'Street Lighting'           => 251,  # Street Lighting
+             'Traffic Lights'            => 103,  # Traffic Lights
+        }
+    } else {
+        return {
+            'Abandoned Vehicle'         => 468,
+            'Accumulated Litter'        => 349,
+            'Dog Bin'                   => 203,
+            'Dog Fouling'               => 288,
+            'Drain or Gully'            => 256,
+            'Fly Posting'               => 465,
+            'Fly Tipping'               => 449,
+            'Graffiti'                  => 292,
+            'Gritting'                  => 200,
+            'Highways'                  => 186,
+            'Litter Bin Overflowing'    => 205,
+            'Manhole Cover'             => 417,
+            'Overhanging Foliage'       => 421,
+            'Pavement Damaged/Cracked'  => 195,
+            'Pothole'                   => 204,
+            'Road Sign'                 => 80,
+            'Roadworks'                 => 246,
+            'Street Lighting'           => 251,
+        };
+    }
+}
+
 =head2 trim_text
 
     my $text = trim_text( $text_to_trim );
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 5ea73625a..3a4c2ef81 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -452,7 +452,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
         $count++ if $_->body =~ /The following updates have been left on this problem:/;
         $count++ if $_->body =~ /The following new problems have been reported to City of\s*Edinburgh Council:/;
         $count++ if $_->body =~ /The following nearby problems have been added:/;
-        $count++ if $_->body =~ / -\s+Testing, EH1 1BB/;
+        $count++ if $_->body =~ /\s+-\s+Testing,\s+EH1\s+1BB/;
     }
     is $count, 5, 'Five emails with the right things in them';
 
diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t
index ab129b4e7..67ddc10aa 100644
--- a/t/app/model/alert_type.t
+++ b/t/app/model/alert_type.t
@@ -202,7 +202,7 @@ for my $test (
         (my $title = $report->title) =~ s/ /\\s+/;
         my $body = $email->body;
 
-        like $body, qr#report/$report_id - $title, $pc#, 'email contains expected postcode';
+        like $body, qr#report/$report_id\s+-\s+$title,\s+$pc#, 'email contains expected postcode';
     };
 }
 
diff --git a/templates/web/barnet/footer.html b/templates/web/barnet/footer.html
index 21848963e..32c6b5f7b 100644
--- a/templates/web/barnet/footer.html
+++ b/templates/web/barnet/footer.html
@@ -1,150 +1,51 @@
-            </div>
-            <br class="cl">
-          </div><!-- end content -->
-      </div><!-- end wrap -->
-      <div id="left-column">
-
-
-        <div id="navigation">
-            <h2>Main Menu</h2>
-            <ul>
-                <li class="section"><a href="/">FixMyStreet</a>
-                <ul>
-                    <li class="section">[% c.req.uri.path == '/'               ? '<strong>Report a problem</strong>' : '<a href="/">Report a problem</a>'           %]</li>
-                    <li class="section">[% c.req.uri.path == '/reports/Barnet' ? '<strong>All reports</strong>'      : '<a href="/reports/Barnet">All reports</a>'  %]</li>
-                    <li class="section">[% c.req.uri.path == '/alert'          ? '<strong>Local alerts</strong>'     : '<a href="/alert">Local alerts</a>'          %]</li>
-                    <li class="section">[% c.req.uri.path == '/faq'            ? '<strong>Help</strong>'             : '<a href="/faq">Help</a>'                    %]</li>
-                </ul>
-            </ul>
-        </div> <!-- end navigation -->
-
-        <div id="online-services">
-            <h2>Online Services</h2>
-            <ul>
-                <li><a href="http://www.barnet.gov.uk/">Barnet Council</a></li>
-            </ul>
-            <!-- <p class="browse-aloud">Listen to this site using <br><a href="#">Browser Aloud</a></p> -->
-        </div> <!-- end online-services -->
-
-<!--
-        <div id="useful-links">
-            <h2>Useful Links</h2>
-            <ul>
-                <li><a href="http://www.barnet.gov.uk/">Council homepage</a></li>
-            </ul>
-        </div>
--->
-
-        <div id="contact">
-            <h2>Contact</h2>
-            <dl>
-                <dt>Council Address</dt>
-                    <dd>
-                        North London Business Park (NLBP),<br>
-                        Oakleigh Road South,<br>
-                        London.<br>
-                        N11 1NP<br>
-                        <a href="http://maps.google.co.uk/maps?f=q&hl=en&geocode=&q=N11+1NP+&sll=53.800651,-4.064941&sspn=11.823255,39.550781&ie=UTF8&ll=51.624877,-0.152156&spn=0.024244,0.077248&t=h&z=14">View map of Barnet</a>
-                    </dd>
-                    <dt>Phone Number</dt>
-                        <dd>020 8359 2000</dd>
-                    <dt>Text Number (SMS)</dt>
-                        <dd>07781 473279</dd>
-                    <dt>Fax Number</dt>
-                        <dd>020 8359 4156</dd>
-                    <dt>Typetalk</dt>
-                        <dd>18001 020 8359 2040</dd>
-                    <dt>Email</dt>
-                        <dd><a href="mailto:first.contact@barnet.gov.uk">first.contact@barnet.gov.uk</a></dd>
-            </dl>
-        </div> <!-- end useful-links -->
-
-      </div><!-- end left-column -->
-
-
-<br class="cl">
-
-            <div id="pre-footer">
-
-                <div class="box-left">
-
-                    <dl>
-                        <dt>Council Address</dt>
-                            <dd>
-                                North London Business Park (NLBP),<br>
-                                Oakleigh Road South,<br>
-                                London.<br>
-                                N11 1NP<br>
-                                <a href="http://maps.google.co.uk/maps?f=q&hl=en&geocode=&q=N11+1NP+&sll=53.800651,-4.064941&sspn=11.823255,39.550781&ie=UTF8&ll=51.624877,-0.152156&spn=0.024244,0.077248&t=h&z=14">View map of Barnet</a>
-                            </dd>
-                        </dl>
-                    <dl>
-                        <dt>Phone Number</dt>
-                            <dd>020 8359 2000</dd>
-                        <dt>Text Number (SMS)</dt>
-                            <dd>07781 473279</dd>
-                        <dt>Fax Number</dt>
-                            <dd>020 8359 4156</dd>
-                        </dl>
-                    <dl>
-                        <dt>Typetalk</dt>
-                            <dd>18001 020 8359 2040</dd>
-                        <dt>Email</dt>
-                            <dd><a href="mailto:first.contact@barnet.gov.uk">first.contact@barnet.gov.uk</a></dd>
-                    </dl>
-                 </div>
-                 <div class="box-right">
-                 <!--
-                 <div class="social-bookmarking">
-                     <h2>Add this page to your social bookmarks:</h2>
-                     <ul>
-                        <li class="facebook"><a href="#">Facebook</a></li>
-                        <li class="delicious"><a href="#">delicious</a></li>
-                        <li class="technorati"><a href="#">Technorati</a></li>
-                        <li class="stumbleupon"><a href="#">StumbleUpon</a></li>
-                        <li class="google"><a href="#">Google</a></li>
-                        <li class="digg"><a href="#">Digg</a></li>
-                     </ul>
-                     <p>(<a href="#">What's social bookmarking?</a>)</p>
-                 </div>
-                 -->
-                 </div>
-
-<br class="cl">
-            </div><!-- end pre-footer -->
-
-
-
-
-            <div id="footer">
+							</div>
+						<!-- end of content, start of  footer -->
+						</div>
+					</div>
+<!-- googleoff: index -->
+					<div id="column_nav">
+						<div class="navigation active">
+							<h2><a href="/">FixMyStreet</a></h2>
               <ul>
-                <li><a href="http://www.barnet.gov.uk/copyright">Copyright</a></li>
-                <li><a href="http://www.barnet.gov.uk/disclaimer">Disclaimer</a></li>
-                <li><a href="http://www.barnet.gov.uk/privacy">Privacy&nbsp;Statement</a></li>
-                <li><a href="http://www.barnet.gov.uk/website-accessibility">Accessibility&nbsp;Statement</a></li>
-                <li><a href="http://www.barnet.gov.uk/atoz">A-Z</a></li>
-                <li><a href="http://www.barnet.gov.uk/faq">FAQs</a></li>
-                <li><a href="http://www.barnet.gov.uk/contact-us">Contact&nbsp;Us</a></li>
-                <li><a href="http://www.barnet.gov.uk/help">Help</a></li>
-                <li><a href="http://www.barnet.gov.uk/sitemap">Sitemap</a></li>
-                <li><a href="http://www.barnet.gov.uk/what%27s_on">What's&nbsp;On</a></li>
+                  <li>[% c.req.uri.path == '/'               ? '<strong>Report a problem</strong>' : '<a href="/">Report a problem</a>'           %]</li>
+                  <li>[% c.req.uri.path == '/reports/Barnet' ? '<strong>All reports</strong>'      : '<a href="/reports/Barnet">All reports</a>'  %]</li>
+                  <li>[% c.req.uri.path == '/alert'          ? '<strong>Local alerts</strong>'     : '<a href="/alert">Local alerts</a>'          %]</li>
+                  <li class="lastItem">[% c.req.uri.path == '/faq'            ? '<strong>Help</strong>'             : '<a href="/faq">Help</a>'                    %]</li>
               </ul>
-            </div><!-- end footer -->
-
-        </div><!-- end iewrap -->
-
-<!-- Piwik -->
-<script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.mysociety.org/" : "http://piwik.mysociety.org/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 12);
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><img width=1 height=1 src="http://piwik.mysociety.org/piwik.php?idsite=12" style="border:0" alt=""></noscript>
-<!-- End Piwik Tag -->
-
-  </body>
-</html>
+						</div>
+						<div class="clear"></div>
+					</div>
+					<div class="clear"></div>
+					<div id="footer">
+						<p class="addNav">
+							<a href="http://www.barnet.gov.uk/copyright">Copyright</a> | <a href="http://www.barnet.gov.uk/privacy">Privacy notice</a> | <a accesskey="0" href="http://www.barnet.gov.uk/accessibility">Accessibility</a> | <a accesskey="8" href="http://www.barnet.gov.uk/terms">Disclaimer</a> | <a accesskey="3" href="http://www.barnet.gov.uk/site_map">Sitemap</a> | <a href="http://www.barnet.gov.uk/contact">Contact us</a> | <a accesskey="6" href="http://www.barnet.gov.uk/a_to_z">A - Z</a>
+						</p>
+						<p class="assocLinks">
+							<a id="goto_browsealoud" href="http://www.browsealoud.co.uk" title="BrowseAloud"><span class="hidden">BrowseAloud</span></a>
+							<a id="goto_directgov" href="http://www.direct.gov.uk" title="DirectGov"><span class="hidden">DirectGov</span></a>
+							<a class="external_link" id="share_facebook" href="http://www.facebook.com/barnetcouncil" title="London Borough of Barnet on Facebook"><span class="hidden">Facebook</span></a>
+							<a class="external_link" id="share_twitter" href="http://www.twitter.com/barnetcouncil" title="London Borough of Barnet on Twitter"><span class="hidden">Twitter</span></a>
+							<a class="external_link" id="share_youtube" href="http://www.youtube.com/Barnetcouncil1" title="London Borough of Barnet on YouTube"><span class="hidden">YouTube</span></a>
+							<a class="external_link" id="share_flickr" href="http://www.flickr.com/photos/barnetcouncil" title="London Borough of Barnet on Flickr"><span class="hidden">Flickr</span></a>
+							<a class="external_link" id="share_sharethis" href="http://www.sharethis.com/barnetcouncil" title="London Borough of Barnet on ShareThis"><span class="hidden">ShareThis</span></a>
+						</p>
+						<div class="clear"></div>
+						<p class="hidden">
+							<a accesskey="1" href="http://www.barnet.gov.uk">Homepage</a>
+							<a accesskey="2" href="http://www.barnet.gov.uk/whats_new" rel="nofollow">What&#39;s new</a>
+							<a accesskey="4" href="http://www.barnet.gov.uk/site_search" rel="nofollow">Search facility </a>
+							<a accesskey="5" href="http://www.barnet.gov.uk/faqs" rel="nofollow">Frequently asked questions</a>
+							<a accesskey="9" href="http://www.barnet.gov.uk/feedback" rel="nofollow">Feedback</a>
+							<a accesskey="/" href="#mast" rel="nofollow">Top of the page</a>
+							<a accesskey="s" href="#content" rel="nofollow">Skip to content</a>
+							<a accesskey="n" href="#column_nav" rel="nofollow">Skip to main navigation</a>
+						</p>
+						<div id="bottomBar">
+						</div>
+					</div>
+<!-- googleon: index -->
+				</div>
+			</div>
+		</div>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html
index 654e3d83c..955473090 100644
--- a/templates/web/barnet/header.html
+++ b/templates/web/barnet/header.html
@@ -1,93 +1,60 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]>   <html class="ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]>   <html class="ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]-->
-    <head>
-        <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/basic.css">
-
-        <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
-        <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/layout.css">
-
-        <!-- Preferred style sheet enabled when the page is loaded -->
-        <link rel="stylesheet" title="default" type="text/css" href="/cobrands/barnet/css/light.css">
-
-        <!-- Alternate style sheets used for the light/relaxed style -->
-        <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/light.css">
-        <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/relaxed.css">
-
-        <!-- Alternate style sheets used for the dark style -->
-        <link rel="alternate stylesheet" title="dark" type="text/css" href="/cobrands/barnet/css/dark.css">
-
-        <!-- Alternate style sheets used for the dark/relaxed style -->
-        <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/dark.css">
-        <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/relaxed.css">
-
-
-        <!--[if lte IE 6]>
-             <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/ie.css">
-
-             <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/ie-relaxed.css">
-
-             <link rel="alternate stylesheet" title="dark" type="text/css" href="/cobrands/barnet/css/ie-dark.css">
-
-             <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-dark.css">
-             <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-relaxed.css">
-        <![endif]-->
-
-        <!--[if IE 7]>
-             <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/ie-seven.css">
-
-             <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/ie-seven-relaxed.css">
-
-             <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-seven-relaxed.css">
-        <![endif]-->
-        <link rel="stylesheet" media="print" type="text/css" href="/cobrands/barnet/css/print.css">
-
-        <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/jquery-1.2.6_common.js') %]"></script>
-        <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/styleswitch.js') %]"></script>
-        <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/jquery-cookie-min.js') %]"></script>
-        <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/2008-portsurf.js') %]"></script>
-
-        [% INCLUDE 'common_header_tags.html' %]
-
-  </head>
-  <body>
-
-  <div id="iewrap">
-  <img id="print-logo" src="/cobrands/barnet/images/logo-barnet.gif" alt="">
-            <div id="header">
-                <a href="http://www.barnet.gov.uk/"><img src="/cobrands/barnet/images/logo-barnet.gif" alt="Barnet Logo"></a>
-
-                <a href="#content" class="rm">Skip to Content</a>
-                <span class="rm">|</span>
-                <a href="#navigation" class="rm">Skip to Menu</a>
-                <span class="rm">|</span>
-
-                <form action="http://www.barnet.gov.uk/search">
-                    <div class="search-input">
-                        <input type="hidden" name="col" value="lbb">
-                        <input type="hidden" name="type" value="sitesearch">
-                        <label for="input-0" class="rm">Search:</label>
-                        <input type="text" value="Please enter your search" name="search" class="search">
-                    </div>
-                    <div class="search-button">
-                        <input type="submit" value="Search" class="submit" id="input-0">
-                    </div>
-                </form>
-
-                <div id="switcher" style="display:none">
-                    <p>Site preferences:</p>
-                    <ul>
-                        <li class="default"><a id="s1" class="styleswitch" rel="default" title="Light colours with the default layout">default</a></li>
-                        <li class="relaxed-light"><a id="s2" class="styleswitch" rel="relaxed light" title="Light colours with the relaxed layout" href="#">relaxed light</a></li>
-                        <li class="dark"><a id="s3" class="styleswitch" rel="dark" title="Dark colours with the default layout" href="#">dark</a></li>
-                        <li class="relaxed-dark"><a id="s4" class="styleswitch" rel="relaxed dark" title="Dark colours with the relaxed layout" href="#">relaxed dark</a></li>
-                    </ul>
-                </div><!-- end switcher -->
-            </div><!-- end header -->
-
-      <div id="wrap">
-          <div id="content">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+	<head>
+		<link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/standard.css" media="screen" />
+<!--[if lte IE 6]>
+		<link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-six.css" media="screen" />
+		<link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-six-print.css" media="print" />
+<![endif]-->
+<!--[if IE 7]>
+	    <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-seven.css" media="screen" />
+<![endif]-->		
+<!--[if IE 8]>
+	    <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-eight.css" media="screen" />
+<![endif]-->		
+		<link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/print.css" media="print" />
+		<link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/handheld.css" media="handheld" />
+		<link rel="Shortcut Icon" type="image/x-icon" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/favicon.ico" />
+		<link rel="ToC" href="http://www.barnet.gov.uk/site_map" />
+		<meta name="Keywords" content="fixmystreet barnet pothole streetlights report street problem" />
+		<meta name="Description" content="FixMyStreet Barnet: report problems in Barnet like graffiti, fly tipping, broken paving slabs, or street lighting" />
+
+ 		<link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">    
+		<link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/layout.css">
+
+    [% INCLUDE 'common_header_tags.html' %]
+
+	</head>
+	<body>
+		<div id="wrapper">
+			<div id="ie_wrapper">
+<!-- googleoff: index -->
+				<div id="mobile_name">London Borough of Barnet</div>
+				<div id="mast">
+					<div class="pseudoH1">
+						<a href="http://www.barnet.gov.uk/"><span>London Borough of Barnet</span> <img src="http://pledgebank.barnet.gov.uk/microsites/barnet/site/images/blank.gif" alt="London Borough of Barnet logo" /></a>
+					</div>
+					<ul id="skip" class="hidden">
+						<li><a href="#content" rel="nofollow">Skip to content</a></li>
+						<li><a href="#column_nav" rel="nofollow">Skip to main navigation</a></li>
+					</ul>
+					<div class="mast_links"></div>
+					<span class="clear"></span>
+					<div id="search"></div>
+					<div class="clear"></div>
+				</div>
+<!-- googleon: index -->
+				<div id="page_wrap">
+					<div id="page">
+						<div id="breadcrumb">
+<!-- googleoff:all -->
+							<ul>
+								<li><a href="/">FixMyStreet Home</a></li>
+								<li class="bc_end"><span>[% c.req.uri.path == '/'? 'Report a problem' : "$title" | html  %]</span></li>
+							</ul>
+<!-- googleon:all -->
+						</div>
+						<div id="content" class="withWidth fullWidth">
               <div id="mysociety">
 
+              <!-- end of header --> 
+\ No newline at end of file
diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html
index d0e385ae6..dac73cbdd 100644
--- a/templates/web/default/admin/council_contacts.html
+++ b/templates/web/default/admin/council_contacts.html
@@ -10,7 +10,11 @@
 [% IF example_pc %]
 <a href="[% c.uri_for_email( '/around', { pc => example_pc } ) %]">[% tprintf( loc('Example postcode %s'), example_pc ) | html %]</a> |
 [% END %]
+[% IF c.cobrand.moniker == 'emptyhomes' %]
+<a href="[% c.uri_for( 'search_reports', search => 'area:' _ area_id ) %]">[% loc('List all reported problems' ) %]</a>
+[% ELSE %]
 <a href="[% c.uri_for_email( '/reports/' _ area_id ) %]">[% loc('List all reported problems' ) %]</a>
+[% END %]
 <a href="[% c.uri_for( 'council_contacts', area_id, { text => 1 } ) %]">[% loc('Text only version') %]</a>
 </p>
 
diff --git a/templates/web/default/admin/search_users.html b/templates/web/default/admin/search_users.html
index b4fa2c2da..18c964dfe 100644
--- a/templates/web/default/admin/search_users.html
+++ b/templates/web/default/admin/search_users.html
@@ -18,7 +18,7 @@
 [%- FOREACH user IN users %]
     <tr>
         <td>[% PROCESS value_or_nbsp value=user.name %]</td> 
-        <td>[% PROCESS value_or_nbsp value=user.email %]</td> 
+        <td><a href="[% c.uri_for( 'search_reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> 
         <td>[% PROCESS value_or_nbsp value=user.from_council %]</td> 
         <td>[% user.flagged ? loc('Yes') : '&nbsp;' %]</td> 
         <td><a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a></td>
diff --git a/templates/web/default/auth/sign_out.html b/templates/web/default/auth/sign_out.html
index 3d8df60e4..23d39aa2d 100644
--- a/templates/web/default/auth/sign_out.html
+++ b/templates/web/default/auth/sign_out.html
@@ -1,8 +1,8 @@
-[% INCLUDE 'header.html', title => loc('Sign out') %]
+[% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %]
 
 <h1>[% loc('You have been signed out') %]</h1>
 
-<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>.</p>
-
+<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>, or
+go back to the <a href="/">FixMyStreet front page</a>.</p>
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index 4931e8230..582afd422 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/default/common_header_tags.html
@@ -3,7 +3,7 @@
 
 <script type="text/javascript" src="/js/validation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script>
 
-<script type="text/javascript" src="/jslib/jquery-1.7.0.min.js"></script>
+<script type="text/javascript" src="/jslib/jquery-1.7.2.min.js"></script>
 <script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script>
 
 <script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script>
diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html
index 71637877a..3148d1993 100644
--- a/templates/web/default/js/validation_strings.html
+++ b/templates/web/default/js/validation_strings.html
@@ -1,21 +1,21 @@
     validation_strings = {
-        update: '[% loc('Please enter a message') %]',
-        title: '[% loc('Please enter a subject') %]',
-        detail: '[% loc('Please enter some details') %]',
+        update: '[% loc('Please enter a message') | replace("'", "\\'") %]',
+        title: '[% loc('Please enter a subject') | replace("'", "\\'") %]',
+        detail: '[% loc('Please enter some details') | replace("'", "\\'") %]',
         name: {
-            required: '[% loc('Please enter your name') %]',
-            validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') %]'
+            required: '[% loc('Please enter your name') | replace("'", "\\'") %]',
+            validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') | replace("'", "\\'") %]'
         },
-        category: '[% loc('Please choose a category') %]',
+        category: '[% loc('Please choose a category') | replace("'", "\\'") %]',
         rznvy: {
-            required: '[% loc('Please enter your email') %]',
-            email: '[% loc('Please enter a valid email') %]'
+            required: '[% loc('Please enter your email') | replace("'", "\\'") %]',
+            email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]'
         },
         email: {
-            required: '[% loc('Please enter your email') %]',
-            email: '[% loc('Please enter a valid email') %]'
+            required: '[% loc('Please enter your email') | replace("'", "\\'") %]',
+            email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]'
         },
-        fms_extra_title: '[% loc('Please enter your title') %]',
-        first_name: '[% loc('Please enter your first name') %]',
-        last_name: '[% loc('Please enter your second name') %]'
+        fms_extra_title: '[% loc('Please enter your title') | replace("'", "\\'") %]',
+        first_name: '[% loc('Please enter your first name') | replace("'", "\\'") %]',
+        last_name: '[% loc('Please enter your second name') | replace("'", "\\'") %]'
     };
diff --git a/templates/web/default/report/_main.html b/templates/web/default/report/_main.html
index 8cc1efec2..3a9e60e7b 100644
--- a/templates/web/default/report/_main.html
+++ b/templates/web/default/report/_main.html
@@ -2,9 +2,11 @@
 
 <p><em>[% problem.meta_line(c) | html %]
 [% IF problem.council %]
-    [% IF problem.whensent %]
-        <small class="council_sent_info"><br>[% problem.duration_string(c) %]</small>
-    [% END %]
+    [% IF problem.whensent || problem.can_display_external_id %]
+        <small class="council_sent_info"><br>
+          [% problem.processed_summary_string(c) %]
+        </small>
+    [% END %]    
 [% ELSE %]
 <br><small>[% loc('Not reported to council') %]</small>
 [% END %]
diff --git a/templates/web/default/report/new/councils_text_all.html b/templates/web/default/report/new/councils_text_all.html
index 2f06686d8..df3388bf3 100644
--- a/templates/web/default/report/new/councils_text_all.html
+++ b/templates/web/default/report/new/councils_text_all.html
@@ -1,5 +1,5 @@
 <p>
-[% IF all_councils.${area_ids_to_list.0}.type == 'LBO' AND area_ids_to_list.0 != 2482 %]
+[% IF area_ids_to_list.0 != 2489 && area_ids_to_list.0 != 2482 && all_councils.${area_ids_to_list.0}.type == 'LBO' %]
 [%
     tprintf(
         loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'),
diff --git a/templates/web/default/static/fun.html b/templates/web/default/static/fun.html
deleted file mode 100644
index 00976f3ec..000000000
--- a/templates/web/default/static/fun.html
+++ /dev/null
@@ -1,35 +0,0 @@
-[% INCLUDE header.html
-    title = 'Weird and Wonderful reports'
-%]
-
-<h1>Weird and Wonderful reports</h1>
-
-<p>Here are some of the best or strangest reports we&rsquo;ve seen on FixMyStreet.
-They&rsquo;ve all been fixed, and in one case could have saved lives!
-Do let us know if you find any more.</p>
-
-<ul style='list-style-type: none; margin:0; padding:0'>
-
-<li><img src='http://www.fixmystreet.com/photo/9468.jpeg' align='right' hspace=8>
-    <h2>Dumped Piano (right)</h2>
-    <p>The reporter of this problem summed it up with their report,
-    which consisted solely of the one character &ldquo;!&rdquo;. &mdash;
-    <a href='http://www.fixmystreet.com/report/9468'>Problem report</a>
-
-<li><h2>Mad Seagull</h2>
-    <p>&ldquo;A seagull is attacking various cars within this road. He starts at around 05:45 every morning and continues until around 19:30. This causes a lot of noisy banging and wakes up children.&rdquo; &mdash;
-    <a href='http://www.fixmystreet.com/report/2722'>Problem report</a>
-
-<li><img src='http://www.fixmystreet.com/photo/6553.jpeg' align='right' hspace=8>
-	<h2>Boxes full of cheese dumped (right)</h2>
-	<p>&ldquo;About a dozen boxes full of mozzarella cheese have been dumped opposite 3 rufford street. if it warms up we could have nasty road topping problem (seriously there is a lot of cheese)&rdquo; &mdash;
-    <a href='http://www.fixmystreet.com/report/6553'>Problem report</a>
-
-<li><h2>Dangerous Nivea Billboard</h2>
-	<p>&ldquo;The Nivea 'Oxygen is a wonderful thing' billboard here has a device on it releasing bubbles and foam. This is blowing into the road which is both distracting and dangerous to drivers. A large ball of foam hit my windscreen unexpectedly and nearly caused me to have an accident&rdquo; &mdash;
-    <a href='http://www.fixmystreet.com/report/7552'>Problem report</a>
-
-</ul>
-
-[% INCLUDE footer.html %]
-
diff --git a/templates/web/fixmystreet/auth/change_password.html b/templates/web/fixmystreet/auth/change_password.html
deleted file mode 100644
index c10560c3e..000000000
--- a/templates/web/fixmystreet/auth/change_password.html
+++ /dev/null
@@ -1,39 +0,0 @@
-[% INCLUDE 'header.html', title = loc('Change Password') %]
-
-<h1>[% loc('Change Password') %]</h1>
-
-[% IF password_changed %]
-    <p id="fixed">[% loc('Your password has been changed') %]</p>
-[% END %]
-
-
-<form action="[% c.uri_for('change_password') %]" method="post" name="change_password" class="fieldset">
-    
-    [% IF password_error;
-
-        errors = {
-            missing  => loc('Please enter a password'),
-            mismatch => loc('The passwords do not match'),
-            other    => loc('Please check the passwords and try again'),
-        };
-        
-        loc_password_error = errors.$password_error || errors.other; %]
-    <div class="form-error">[% loc_password_error %]</div>
-    [% END %]
-
-    <div class="form-field">
-        <label for="new_password">[% loc('Password:') %]</label>
-        <input type="password" name="new_password" value="[% new_password | html %]">
-    </div>
-    <div class="form-field">
-        <label for="confirm">[% loc('Again:') %]</label>
-        <input type="password" name="confirm" value="[% confirm | html %]">
-    </div>
-    <div class="checkbox">
-        <input type="submit" value="[% loc('Change Password') %]">
-    </div>
-
-</form>
-
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/fixmystreet/auth/sign_out.html b/templates/web/fixmystreet/auth/sign_out.html
deleted file mode 100644
index 23d39aa2d..000000000
--- a/templates/web/fixmystreet/auth/sign_out.html
+++ /dev/null
@@ -1,8 +0,0 @@
-[% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %]
-
-<h1>[% loc('You have been signed out') %]</h1>
-
-<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>, or
-go back to the <a href="/">FixMyStreet front page</a>.</p>
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/fixmystreet/auth/token.html b/templates/web/fixmystreet/auth/token.html
deleted file mode 100644
index 0f44d1074..000000000
--- a/templates/web/fixmystreet/auth/token.html
+++ /dev/null
@@ -1,27 +0,0 @@
-[% INCLUDE 'header.html', title => loc('Confirm account') %]
-
-[% IF token_not_found %]
-
-<h1>[% loc('Error') %]</h1>
-
-<p>We have not been able to confirm your account - sorry. This may be because:</p>
-
-<ul>
-    <li>Link too old or already used</li>
-    <li>URL not copied correctly</li>
-    [%# FIXME - add more reasons here %]
-</ul>
-
-[% ELSE %]
-
-<h1>[% loc('Please check your email') %]</h1>
-
-<p>[% loc("We have sent you an email containing a link to confirm your account.") %]</p>
-
-<p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient.") %]</p>
-
-<p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p>
-
-[% END %]
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html
index 462c43564..fe899d3a2 100755
--- a/templates/web/fixmystreet/faq/faq-en-gb.html
+++ b/templates/web/fixmystreet/faq/faq-en-gb.html
@@ -5,8 +5,8 @@
         <ul class="plain-list">
             <li><a href="#faq">Frequently Asked Questions</a></li>
             <li><a href="#practical">Practical Questions</a></li>
-            <li><a href="#privacy">Privacy Questions</a></li>
             <li><a href="#organisation">Organisation Questions</a></li>
+            <li><a href="/privacy">Privacy and cookies</a></li>
         </ul>
     </aside>
 </div>
@@ -133,22 +133,6 @@ by a user of the site.</dd>
     to publicise us on the web or in your local area, and why not write to your
     local paper to let them know about us?</dd> </dl>
     
-    <h2><a name="privacy"></a>Privacy Questions</h2>
-    <dl>
-        <dt>Who gets to see my email address?</dt>
-        <dd>If you submit a problem, we pass on your details, and details
-of the problem, to the council contact or contacts responsible for the
-area where you located the problem. Other than the council, who obviously get your 
-email address, only people we authorise to view the FixMyStreet administration interface
-will be able to see your email address and they will never use it for anything other than 
-to help administer FixMyStreet. Similarly with email addresses from updates. We will never give or sell your email address to anyone else, 
-unless we are obliged to by law. Your name will not be published anywhere unless you let us.</dd>
-        <dt>Will you send nasty, brutish spam to my email address?</dt>
-        <dd>Never. We will email you if someone leaves an update on a
-problem you&rsquo;ve reported, and send you a questionnaire email four weeks
-after you submit a problem, asking for a status update; we&rsquo;ll only ever
-send you emails in relation to your problem.</dd>
-    </dl>
     <h2><a name="organisation"></a>Organisation Questions</h2>
     <dl>
         <dt>Who built FixMyStreet?</dt>
diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html
index c73c9eb2c..ada4b5d7e 100644
--- a/templates/web/fixmystreet/footer.html
+++ b/templates/web/fixmystreet/footer.html
@@ -25,6 +25,7 @@
                                 </ul>
                             </div>
                         </div>
+                        <p><a href="/privacy">Privacy and cookies</a></p>
                     </footer>
                     [% END %]
                 </div><!-- .content role=main -->
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html
index 3ae3da6cb..85e693cb6 100644
--- a/templates/web/fixmystreet/header.html
+++ b/templates/web/fixmystreet/header.html
@@ -13,14 +13,14 @@
 
         <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/base.css') %]">
         <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)">
-	<link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]">
+        [% extra_css %]
         <!--[if (lt IE 9) & (!IEMobile)]>
             <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]">
         <![endif]-->
 
         <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
-        <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script>
+        [% extra_js %]
                 
         [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
             <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]">
diff --git a/templates/web/fixmystreet/questionnaire/index.html b/templates/web/fixmystreet/questionnaire/index.html
index 3b23c81cd..ded95df04 100644
--- a/templates/web/fixmystreet/questionnaire/index.html
+++ b/templates/web/fixmystreet/questionnaire/index.html
@@ -1,4 +1,5 @@
 [%
+    PROCESS "report/photo-js.html";
     PROCESS "maps/${map.type}.html";
     INCLUDE 'header.html', title = loc('Questionnaire'), bodyclass = 'mappage'
 %]
diff --git a/templates/web/fixmystreet/report/_main.html b/templates/web/fixmystreet/report/_main.html
index 762aa10f7..7ceb1f6a5 100644
--- a/templates/web/fixmystreet/report/_main.html
+++ b/templates/web/fixmystreet/report/_main.html
@@ -4,8 +4,10 @@
 	<p><em>
 	[% problem.meta_line(c) | html %]
 	[% IF problem.council %]
-	    [% IF problem.whensent %]
-	        <small class="council_sent_info"><br>[% problem.duration_string(c) %]</small>
+	    [% IF problem.whensent || problem.can_display_external_id %]
+	        <small class="council_sent_info"><br>
+	          [% problem.processed_summary_string(c) %]
+	        </small>
 	    [% END %]
 	[% ELSE %]
 	<br><small>[% loc('Not reported to council') %]</small>
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index 72c637a5b..369a0c2b2 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -1,4 +1,5 @@
 [% 
+    PROCESS "report/photo-js.html";
     PROCESS "maps/${map.type}.html";
 
     problem_title = problem.title _ ' - ' _ loc('Viewing a problem');
diff --git a/templates/web/fixmystreet/report/photo-js.html b/templates/web/fixmystreet/report/photo-js.html
new file mode 100644
index 000000000..df0e2f92d
--- /dev/null
+++ b/templates/web/fixmystreet/report/photo-js.html
@@ -0,0 +1,8 @@
+[% IF c.cobrand.allow_photo_display %]
+    [% extra_css = BLOCK %]
+	    <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]">
+    [% END %]
+    [% extra_js = BLOCK %]
+        <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script>
+    [% END %]
+[% END %]
diff --git a/templates/web/fixmystreet/static/for_councils.html b/templates/web/fixmystreet/static/for_councils.html
index 2e83c7c6c..1e1789df7 100644
--- a/templates/web/fixmystreet/static/for_councils.html
+++ b/templates/web/fixmystreet/static/for_councils.html
@@ -38,8 +38,6 @@ forty local authorities in the UK. We understand the challenges that councils
 face in channel shift, and will bring our passion and expertise to support your
 journey.
 
-<p><a href="http://www.mysociety.org/wp/wp-content/uploads/2012/02/FixMyStreet_for_councils_2012.pdf">FixMyStreet for Councils brochure</a>
-
 <p>Have questions? Read our <a href="/for-councils/faq">Questions and Answers for Councils</a>
 or get in touch at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>.
 
diff --git a/templates/web/fixmystreet/static/for_councils_faq.html b/templates/web/fixmystreet/static/for_councils_faq.html
index 16c7d5cfe..d45166ed1 100644
--- a/templates/web/fixmystreet/static/for_councils_faq.html
+++ b/templates/web/fixmystreet/static/for_councils_faq.html
@@ -131,15 +131,22 @@ href="mailto:hello&#64;mysociety.org">let us know</a>.
 
 <dd>
 <ul>
-<li>The front end product costs £3,500 in year one, reducing to £1,500 per annum in future years.
-<li>The mobile web version costs £3,000 in year one and £1,000 per annum subsequently.
-<li>Back-end integration costs depend on the complexity of your systems. Prices start at £3,500 in year one, then  £1,500 per annum.
+<li>The front end product costs £3,500 in year one, reducing to £2,000 per annum in future years.
+<li>Web and mobile-optimised site together cost £5,500 in year one and £3,000 per annum subsequently.
+<li>Web, mobile-optimised site, and iPhone and Android apps cost £9,500 in year one, then £4,000 per annum.
 </ul>
 
+<p>We also offer fixed price for integration with Microsoft, Oracle and
+Lagan CRM systems, at £5,500 in year one, then £2,000 per annum
+thereafter. Integration with other CRM or back-office systems costs
+£6,500 in year one,
+
+<p>These prices exclude VAT and assume standard FixMyStreet for councils
+product - if you need further customisations please get in touch with
+us for a quote.
+
 <p>The prices are all-inclusive, covering installation, updates, unlimited
-problem reports and user training. There are no hidden fees. Please see <a
-href="http://www.mysociety.org/wp/wp-content/uploads/2012/02/FixMyStreet_for_councils_2012.pdf">our
-brochure</a> for more detail on what’s included.
+problem reports and user training. There are no hidden fees.
 
 <p>There’s no commitment beyond the first 12 months, so you won’t be locked
 into a lengthy contract.
diff --git a/templates/web/fixmystreet/static/privacy.html b/templates/web/fixmystreet/static/privacy.html
new file mode 100755
index 000000000..933afe1e5
--- /dev/null
+++ b/templates/web/fixmystreet/static/privacy.html
@@ -0,0 +1,80 @@
+[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %]
+
+<div class="sticky-sidebar">
+    <aside>
+        <ul class="plain-list">
+            <li><a href="/faq#faq">Frequently Asked Questions</a></li>
+            <li><a href="/faq#practical">Practical Questions</a></li>
+            <li><a href="/faq#organisation">Organisation Questions</a></li>
+            <li><strong>Privacy and cookies</strong></li>
+        </ul>
+    </aside>
+</div>
+
+<h1>Privacy, cookies, and third party services</h1>
+
+<p><strong>Our use of your data, cookies, and external services: what you should know, and how to opt out if you want to.</strong></p>
+
+<p>Summary: We care a lot about our users’ privacy. We provide details below,
+and we try our hardest to look after the private data that we hold. Like many
+other websites, we sometimes use cookies and Google Analytics to help us make
+our websites better. These tools are very common and used by many other sites,
+but they do have privacy implications, and as a charity concerned with socially
+positive uses of the internet, we think it’s important to explain them in full.
+If you don’t want to share your browsing activities on mySociety’s sites with
+other companies, you can adjust your usage or install opt-out browser plugins.
+
+<h2>Privacy</h2>
+
+    <dl>
+        <dt>Who gets to see my email address?</dt>
+        <dd>If you submit a problem, we pass on your details, and details
+of the problem, to the council contact or contacts responsible for the
+area where you located the problem. Other than the council, who obviously get your 
+email address, only people we authorise to view the FixMyStreet administration interface
+will be able to see your email address and they will never use it for anything other than 
+to help administer FixMyStreet. Similarly with email addresses from updates. We will never give or sell your email address to anyone else, 
+unless we are obliged to by law. Your name will not be published anywhere unless you let us.</dd>
+        <dt>Will you send nasty, brutish spam to my email address?</dt>
+        <dd>Never. We will email you if someone leaves an update on a
+problem you&rsquo;ve reported, and send you a questionnaire email four weeks
+after you submit a problem, asking for a status update; we&rsquo;ll only ever
+send you emails in relation to your problem.</dd>
+    </dl>
+
+<h2>Cookies</h2>
+
+<p>To make our service easier or more useful, we sometimes place small data files on your computer or mobile phone, known as cookies; many websites do this. We use this information to, for example, remember you have logged in so you don't need to do that on every page, or to measure how people use the website so we can improve it and make sure it works properly. Below, we list the cookies and services that this site can use.
+
+<table cellpadding=5>
+<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr>
+<tr><td>fixmystreet_app_session</td><td nowrap>A random unique identifier</td><td>When browser is closed, or four weeks if &ldquo;Keep me signed in&rdquo; is ticked</td></tr>
+</table>
+
+<h3>Measuring website usage (Google Analytics)</h3>
+
+<p>We use Google Analytics to collect information about how people use this site. We do this to make sure it’s meeting its users’ needs and to understand how we could do it better. Google Analytics stores information such as what pages you visit, how long you are on the site, how you got here, what you click on, and information about your web browser. IP addresses are masked (only a portion is stored) and personal information is only reported in aggregate. We do not allow Google to use or share our analytics data for any purpose besides providing us with analytics information, and we recommend that any user of Google Analytics does the same.
+
+<p>If you’re unhappy with data about your visit to be used in this way, you can install the <a href="http://tools.google.com/dlpage/gaoptout">official browser plugin for blocking Google Analytics</a>.
+
+<p>The cookies set by Google Analytics are as follows:
+
+<table cellpadding=5>
+<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr>
+<tr><td>__utma</td><td>Unique anonymous visitor ID</td><td>2&nbsp;years</td></tr>
+<tr><td>__utmb</td><td>Unique anonymous session ID</td><td>30&nbsp;minutes</td></tr>
+<tr><td>__utmz</td><td>Information on how the site was reached (e.g. direct or via a link/search/advertisement)</td><td>6&nbsp;months</td></tr>
+<tr><td>__utmx</td><td>Which variation of a page you are seeing if we are testing different versions to see which is best</td><td>2&nbsp;years</td></tr>
+</table>
+
+<h4>Google’s Official Statement about Analytics Data</h4>
+
+<p>“This website uses Google Analytics, a web analytics service provided by Google, Inc. (“Google”). Google Analytics uses “cookies”, which are text files placed on your computer, to help the website analyze how users use the site. The information generated by the cookie about your use of the website (including your IP address) will be transmitted to and stored by Google on servers in the United States . Google will use this information for the purpose of evaluating your use of the website, compiling reports on website activity for website operators and providing other services relating to website activity and internet usage.  Google may also transfer this information to third parties where required to do so by law, or where such third parties process the information on Google’s behalf. Google will not associate your IP address with any other data held by Google.  You may refuse the use of cookies by selecting the appropriate settings on your browser, however please note that if you do this you may not be able to use the full functionality of this website.  By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above.”</p>
+
+<p><a href="http://www.mysociety.org/privacy-online/">More general information on how third party services work</a></p>
+
+<h2>Credits</h2>
+
+<p>Bits of wording taken from the <a href="http://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open Government Licence).
+
+[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/fixmystreet/tracking_code.html b/templates/web/fixmystreet/tracking_code.html
index b506d41c1..52018b312 100644
--- a/templates/web/fixmystreet/tracking_code.html
+++ b/templates/web/fixmystreet/tracking_code.html
@@ -4,6 +4,7 @@
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-660910-4']);
   _gaq.push(['_setDomainName', '.fixmystreet.com']);
+  _gaq.push (['_gat._anonymizeIp']);
   _gaq.push(['_trackPageview']);
 
   (function() {
diff --git a/urls.txt b/urls.txt
deleted file mode 100644
index 5c9b25f34..000000000
--- a/urls.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a list of some of the urls currently served:
-
-homepage:           /
-postcode search:    /?pc=SW1A+1AA
-placename:          /?pc=Westminster
-street (ambiguous): /?pc=St+Margaret+St
-street (exact):     /?pc=St+Margaret+St%2c+Westminster%2c+London+SW1A+2
-
-all reports:        /reports
-council reports:    /reports/Aberdeen
-individual report:  /report/173526
-
diff --git a/web/cobrands/barnet/css/basic.css b/web/cobrands/barnet/css/basic.css
deleted file mode 100644
index c3aa2c784..000000000
--- a/web/cobrands/barnet/css/basic.css
+++ /dev/null
@@ -1,74 +0,0 @@
-
-/* Basic Styles */
-
-body {
-    color: #000;
-    margin:  0;
-    padding: 0; 
-    font: 13px Arial, Helvetica, Verdana, sans-serif;
-    }
-    
-h1, h2, h3, h4, h5, p, ol, ul, li, table, dl, dt, dd {
-    line-height: 1.5em
-    }
-
-a, a:link {text-decoration: underline; color: #006666}
-a:visited {color:#666}
-a:hover {text-decoration: none}
-
-img {
-    border: none;
-}
-
-h1, h2, h3, h4, h5 {margin: 1em 0 0.5em 0;}
-
-h1 {font-size:2.7em; line-height:1.27em}
-h2 {font-size:1.93em;}
-h3 {font-size:1.308em;}
-h4 {font-size:1.077em;}
-h5 {font-size:1em;}
-
-ul {list-style-type: none; padding: 0;}
-
-ul ul, ol ul { padding: 0 0 0 15px; margin-top: 0;}
-
-ul li, ul ul li, ul ul ul li {margin: 0.3em 0 0 0; padding: 0 0 0 15px;}
-
-ul ul ul li {font-style: italic;}
-
-ol {padding: 0 0 0 20px;}
-
-ol ol, ul ol {
-    margin-top: 0;
-    padding: 0 0 0 30px;
-    }
-   
-ol li, ol ol li, ol ol ol li {
-    margin: 0.3em 0 0 0;
-    padding: 0;
-    background: none;
-    }
-
-ol ol li {list-style-type: lower-latin;}
-
-ol ol ol li {list-style-type: lower-roman;}
-ul ol li {background: none;}
-
-dl {padding: 0;}
-dt {font-weight: bold;}
-dd {margin: 0;}    
-
-q {font-size: 120%;}
-
-blockquote {
-    font-size: 122%;
-    padding: 0; 
-    margin: 0 10px;
-    }
-
-/* FixMyStreet additions */
-
-select, input, textarea {
-    font-size: 99%;
-}
-
diff --git a/web/cobrands/barnet/css/dark.css b/web/cobrands/barnet/css/dark.css
deleted file mode 100644
index b14780f4b..000000000
--- a/web/cobrands/barnet/css/dark.css
+++ /dev/null
@@ -1,144 +0,0 @@
-
-/*== DARK COLOR OVERIDES ==*/
-#iewrap, #proposition-image {background:#000; color:#fff}
-
-.online-services h2, .a-z h2 {background-image: url('../images/icon-online-services.png');}
-.a-z h2 {background:none}
-
-.online-services li a {background: url(../images/arrow-red.gif) no-repeat 6px 10px}
-.whats-on div {background-image: url('../images/icon-whats-on.png');}
-.council-meetings div {background-image: url('../images/icon-council-meetings.png');}
-.highlights h2 {background-image: url('../images/icon-highlights.png');}
-.media h2 {background-image: url('../images/icon-media-centre.png');}
-.browse-aloud p {background: url('../images/logo-browse-aloud.gif') no-repeat 10px 0;}
-
-.highlights h2 {border-color:#FFC000;}
-.media h2 {border-color: #591cca;}
-.online-services h2, .a-z h2 {border-color: #cc6666;}
-
-
-
-/*Green borders*/
-#pre-footer .box-right div {border: 1px solid #fff; border-bottom:medium none; border-top:medium none;}
-#main-propostion, #pre-footer {background:#1e3d3f url('../images/dark/main-prop-border.gif') repeat-y 35px 0pt;}
-#col-wrapper, #pre-footer .box-right div, #iewrap #col-wrapper {border-color:#008483}
-
-/*Headings and links*/
-.highlights h2, #col-left .highlights a {color:#f7ff9c;}
-.media h2, #col-left .media a {color:#d2cffc}
-
-#navigation-index h1, #navigation-index li a, #col-left h2, #col-left .link-bar a, #pre-footer a, 
-#pre-footer a:link, #col-left .online-services li a, #col-left .online-services li a:link,
-#col-left .whats-on h2 a, #col-left .council-meetings h2 a, #iewrap .media p span, #pre-footer h2 {color:#fff}
-
-.whats-on div, .council-meetings div {background-color:#333}
-.link-bar {background:#333; border-color:#fff;}
-
-.media li {border-bottom:1px solid #323232}
-
-#navigation-index li a {border-color:#1E3D3F }
-
-#col-left .a-z li a {background:#1e3d3f; color:#fff}
-#col-left .a-z li a:hover {background:#1e3d3f; color:#fff}
-
-/*Righ column*/
-#col-right, #col-right div, #iewrap #col-right .useful-links ul {background: url('../images/dark/related-bg.gif');}
-
-/*Dynamic tab*/
-#col-right ul ul, #col-right li a.tab-on  {background-color:#000; color:#fff}
-#col-right ul ul, #col-right li a.tab-on {border-color:#693a42}
-#col-right a, #col-right a:link {color:#fbccd2}
-
-/*Feed Icons*/
-#col-left .whats-on h2 .feed {background-image: url('../images/dark/rss-whats-on.gif')}
-#col-left .highlights h2 .feed {background-image: url('../images/dark/rss-highlights.gif')}
-#col-left .media h2 .feed {background-image: url('../images/dark/rss-media.gif')}
-
-/*Social and Useful Links Logos*/
-#col-right li a.leader-listens {background-image: url('../images/dark/link-images/logo-leader-listens.gif')}
-#col-right li a.whereilive {background-image: url('../images/dark/link-images/logo-whereilive.gif')}
-#col-right li a.facebook {background-image: url('../images/dark/link-images/logo-facebook.gif')}
-#col-right li a.twitter {background-image: url('../images/dark/link-images/logo-twitter.gif')}
-#col-right li a.you-tube {background-image: url('../images/dark/link-images/logo-youtube.gif')}
-#col-right li a.flickr {background-image: url('../images/dark/link-images/logo-flickr.gif')}
-#col-right li a.base {background-image: url('../images/dark/link-images/logo-base.gif')}
-#col-right li a.direct-me {background-image: url('../images/dark/link-images/logo-directme.gif')}
-#col-right li a.directgov {background-image: url('../images/dark/link-images/logo-directgov.gif')}
-#col-right li a.support-people {background-image: url('../images/dark/link-images/logo-supporting-people.gif')}
-
-/*Links arrows*/
-#navigation-index li a {background-image: url('../images/dark/arrow-green.gif')}
-.online-services li a {background-image: url('../images/dark/arrow-red.gif')}
-
-/*Navigation*/
-#navigation-index li a.current {background:transparent url(../images/dark/cnr-expanded-tab_nw.png) no-repeat left top;}
-#navigation-index li a.current .ne {background:transparent url(../images/dark/cnr-expanded-tab_ne.gif) no-repeat 0 0;}
-
-
-
-a, a:link {color:#99ffff}
-a, a:visited {color:#9a9a9a}
-strong, #pre-footer .social-bookmarking h2, #content form label {color:#fff;}
-
-/*=== Content Page Layout :: Colours and Customisations===*/
-
-#content{border: 1px solid #1e3e3e; border-width: 0 1px 0 1px}
-#wrap {background: url(../images/dark/wrap-border.gif) repeat-y 35px 0;}
-
-/*=== Content Page Layout Elements :: Colours and Customisations===*/
-
-h1, h2 {border-bottom: 1px solid #008184; color:#fff}
-h3, h4, h5 {color:#fff}
-
-#content a:focus, #content a:active {color:#fff; background: #008184; }
-
-#content blockquote, #content q {
-    background: #204343 url('../images/dark/quote.gif') no-repeat 10px 10px;
-    border: 1px solid #008184;
-    border-width: 1px 0
-    }
-#content q {background-image:none}
-
-#content ul li {background: url('../images/dark/arrow-green-small.gif') no-repeat 5px 5px}
-#content ul li ol li {background: none}
-#content ul li ul li, #content ol li ul li {background: url('../images/arrow-hyphen-small.gif') no-repeat 3px 10px}
-
-th {background:#008184; color:#fff}
-tr td {background:#1e3e3e}
-tr.even td {background:#0f1f1f}
-table.data td, table.data th {border-right: 3px solid #000}
-
-    /* Navigation colours */
-
-#left-column #navigation, #left-column #online-services, #left-column #useful-links, #left-column #contact {
-    background-image: url(../images/dark/main-prop-border.gif);
-    background-position: 35px 0;
-    background-repeat: repeat-y;
-    }
-#left-column #online-services {background-image: url(../images/dark/red-border.gif);}
-#left-column #useful-links, #left-column #contact {background-image: url(../images/dark/grey-border.gif);}
-
-#left-column li a, #left-column li strong {color:#fff}
-
-#left-column #navigation {background-color:#1E3D3F}
-#left-column #online-services {background-color:#442c2c}
-#left-column #useful-links, #left-column #contact {background-color:#343434}
-
-#left-column #navigation h2 {color: #fff; border-color: #008184; background-image: url('../images/dark/icon-welcome.gif')}
-#left-column #online-services h2 {color:#fff; border-color: #cc6666; background-image: url('../images/dark/icon-online-services-small.gif')}
-#left-column #useful-links h2, #left-column #contact h2 {color:#fff; border-color: #999999; background-image: url('../images/dark/icon-useful-links-small.gif')}
-#left-column #contact h2 {background-image: url('../images/dark/icon-contact-small.gif')}
-
-#left-column #navigation li a {background-image: url('../images/dark/arrow-green-small.gif')}
-#left-column #online-services li a {background-image: url('../images/dark/arrow-red-small.gif')}
-#left-column #useful-links li a {background-image: url('../images/dark/arrow-grey-small.gif')}
-
-#left-column div a {color:#fff}
-#left-column li li strong {background-image: url('../images/arrow-current-nav.gif'); background-color: #008184; color:#fff}
-#left-column #navigation li li li li li a {background-image: url('../images/arrow-hyphen-small.gif'); background-position: 50px 14px}
-
-    /* Forms colours */
-
-#content input[type|='text'] {border: 1px solid #008184}
-.error {color: #d04747}
-
diff --git a/web/cobrands/barnet/css/ie-dark.css b/web/cobrands/barnet/css/ie-dark.css
deleted file mode 100644
index a0a7c3c41..000000000
--- a/web/cobrands/barnet/css/ie-dark.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/*=========== Styles for IE version 5-6=======*/
-
-
-/*===Basic styles=======*/
-
-body {font-size: 80%;}
-
-#iewrap {width:expression(document.body.clientWidth < 790? "780px": document.body.clientWidth > 1382? "1380px" : "auto" );}
-
-
-#header {height:80px}
-#switcher {margin:-50px 23px 0 0}
-
-#navigation-index, #proposition-image {width:49.9%;}
-
-#main-propostion, #col-wrapper, #pre-footer, .info-bar, #col-right ul {height:1%}
-
-#header form .search-button input {padding: 5px 5px 8px 5px;}
-#header form {position:relative; top:-1px}
-#header form .search-button {margin:0; position:relative; left:5px}
-#header form .search-input input {position:relative; top:1px}
-
-#col-left {width: 66.6%;}
-#col-right {width:33.3%;}
-
-.box-left, .box-right, #col-right li {width:49.9%;}
-
-#navigation-index li a.current .ne {margin-right:-3px;}
-.menu p {padding: 3px 0 7px 0}
-
-#col-right ul {height:1%}
-#col-right ul ul {position: absolute}
-
-.media li {padding-bottom:5px}
-
-.social-links {height:420px}
-
-.highlights li {height: 81px}
-#col-right li li {height: 66px}
-
-#col-left .whats-on h2, #col-left .council-meetings h2 {margin:0 0 0 0;}
-#col-left h2 .feed {right:10px}
-
-.highlights ul {height:280px}
-.media ul {height:285px}
-#col-right .useful-links ul {height:175px}
-
-
-.tab-on {z-index:100}
-#col-right ul ul {z-index:50;}
-
-.link-bar, .online-services li a {height:1%}
-.a-z li {height:25px; width:25px;}
-#col-left .a-z li.numbers a {width:26px}
-.a-z ul {width:97%; margin-left:-6px}
-
-.box-left, .box-right {padding:0 0 9px 0;}
-.media {padding-bottom:0px}
-#pre-footer .box-right div {height:115px;}
-
-
-.browse-aloud p {margin-bottom:15px}
-#col-right #social-links-tabs {padding:0; margin:0}
-
-
-.menu {filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/expanded-tab.png', sizingMethod='scale'); background: none;}
-
-#navigation-index li a.current {zoom:1;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/cnr-expanded-tab_nw.png', sizingMethod='crop'); background: none;}
-
-#navigation-index h1 {background-image: url(../images/dark/icon-welcome.gif)}
-.online-services h2 {background-image:url(../images/dark/icon-online-services.gif);}
-.whats-on div {background-image:url(../images/dark/icon-whats-on.gif);}
-.council-meetings div {background-image:url(../images/dark/icon-council-meetings.gif);}
-.highlights h2 {background-image:url(../images/dark/icon-highlights.gif);}
-.media h2 {background-image:url(../images/dark/icon-media-centre.gif);}
-
-
-/*IE RELAXED OVERIDES*/
-
-#navigation-index li a.current {zoom:1;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/dark/cnr-expanded-tab_nw.png', sizingMethod='crop'); background: none;}
-
-
-
-
diff --git a/web/cobrands/barnet/css/ie-relaxed.css b/web/cobrands/barnet/css/ie-relaxed.css
deleted file mode 100644
index dfee99e22..000000000
--- a/web/cobrands/barnet/css/ie-relaxed.css
+++ /dev/null
@@ -1,9 +0,0 @@
-
-/*IE RELAXED OVERIDES*/
-body {font-size: 100%;}
-.highlights ul {height:310px}
-.media ul {height:315px}
-#col-right .useful-links ul {height:405px}
-#pre-footer .box-right div {height:165px;}
-#col-left .a-z li.numbers a {width:30px}
-#col-right li li {height: 73px}
-\ No newline at end of file
diff --git a/web/cobrands/barnet/css/ie-seven-relaxed.css b/web/cobrands/barnet/css/ie-seven-relaxed.css
deleted file mode 100644
index eeaaebf0a..000000000
--- a/web/cobrands/barnet/css/ie-seven-relaxed.css
+++ /dev/null
@@ -1,2 +0,0 @@
-/*IE7 RELAXED OVERIDES*/
-body {font-size: 100%;}
diff --git a/web/cobrands/barnet/css/ie-seven.css b/web/cobrands/barnet/css/ie-seven.css
deleted file mode 100644
index 353e313f5..000000000
--- a/web/cobrands/barnet/css/ie-seven.css
+++ /dev/null
@@ -1,51 +0,0 @@
-/*===== styles for IE Seven ======*/
-
-body {font-size: 80%;}
-
-#switcher {margin-top:-50px}
-
-#main-propostion, #col-wrapper, #pre-footer, .info-bar, #col-right ul, .link-bar {height:1%}
-#navigation-index, #proposition-image, #navigation-index li, .menu li {width:49.99%;}
-
-#header form .search-button input {padding: 5px 5px 8px 5px;}
-#header form {position:relative; top:-1px}
-#header form .search-button {margin:0; position:relative; left:5px}
-
-#header form .search-input input {position:relative; top:1px}
-
-.box-left, .box-right, #col-right li {width:49.9%;}
-
-
-form .nw {top: 4px; left:0}
-form .ne {top: 4px; right:0}
-form .sw {bottom: 4px; left:0}
-form .se {bottom: 4px; right:0}
-.wide-row .nw, .wide-row .ne, .wide-row .sw, .wide-row .se {display:block}
-
-form .wide-row .nw {top: 3px}
-form .wide-row .ne {top: 3px}
-form .wide-row .sw {bottom: 0px}
-form .wide-row .se {bottom: 0px}
-
-form .submit-row .ne {right:-1px}
-form .submit-row .se {right:-1px}
-.submit-row div {padding: 3px 12px;}
-
-
-.required {vertical-align: top; padding-top: 0;} 
-
-h1 {line-height:1.3em}
-#content .coloured, #content .data {border-spacing: expression(cellSpacing=1); /* for IE */}
-
-.menu p {padding: 3px 0 7px 0}
-
-#col-right .useful-links li {}
-
-.highlights li {min-height:81px;}
-.media li {padding-bottom:5px}
-#col-right #social-links-tabs {padding:0; margin:0}
-
-.browse-aloud p {margin-bottom:15px}
-.tab-on {margin-bottom:20px}
-
-#pre-footer {margin-top:5px}
diff --git a/web/cobrands/barnet/css/ie.css b/web/cobrands/barnet/css/ie.css
deleted file mode 100644
index f3316c98b..000000000
--- a/web/cobrands/barnet/css/ie.css
+++ /dev/null
@@ -1,86 +0,0 @@
-/*=========== Styles for IE version 5-6=======*/
-
-
-/*===Basic styles=======*/
-
-body {font-size: 80%;}
-
-#iewrap {width:expression(document.body.clientWidth < 790? "780px": document.body.clientWidth > 1382? "1380px" : "auto" );}
-
-
-#header {height:80px}
-#switcher {margin:-50px 23px 0 0}
-
-#navigation-index, #proposition-image {width:49.9%;}
-
-#main-propostion, #col-wrapper, #pre-footer, .info-bar, #col-right ul {height:1%}
-
-#header form .search-button input {padding: 5px 5px 8px 5px;}
-#header form {position:relative; top:-1px}
-#header form .search-button {margin:0; position:relative; left:5px}
-#header form .search-input input {position:relative; top:1px}
-
-#col-left {width: 66.6%;}
-#col-right {width:33.3%;}
-
-h1 {line-height:1.3em}
-
-.box-left, .box-right, #col-right li {width:49.9%;}
-
-#navigation-index li a.current .ne {margin-right:-3px;}
-.menu p {padding: 3px 0 7px 0}
-
-#col-right ul {height:1%}
-#col-right ul ul {position: absolute}
-
-.media li {padding-bottom:5px}
-
-.social-links {height:420px}
-
-.highlights li {height: 81px}
-#col-right li li {height: 66px}
-
-#col-left .whats-on h2, #col-left .council-meetings h2 {margin:0 0 0 0;}
-#col-left h2 .feed {right:10px}
-
-.highlights ul {height:280px}
-.media ul {height:285px}
-#col-right .useful-links ul {height:175px}
-
-
-.tab-on {z-index:100}
-#col-right ul ul {z-index:50;}
-
-.link-bar, .online-services li a {height:1%}
-.a-z li {height:25px; width:25px;}
-#col-left .a-z li.numbers a {width:26px}
-.a-z ul {width:97%; margin-left:-6px}
-
-.box-left, .box-right {padding:0 0 9px 0;}
-.media {padding-bottom:0px}
-#pre-footer .box-right div {height:115px;}
-
-
-.browse-aloud p {margin-bottom:15px}
-#col-right #social-links-tabs {padding:0; margin:0}
-
-#navigation-index h1 {background-image: url(../images/icon-welcome.gif)}
-.online-services h2 {background-image:url(../images/icon-online-services.gif);}
-.whats-on div {background-image:url(../images/icon-whats-on.gif);}
-.council-meetings div {background-image:url(../images/icon-council-meetings.gif);}
-.highlights h2 {background-image:url(../images/icon-highlights.gif);}
-.media h2 {background-image:url(../images/icon-media-centre.gif);}
-
-
-#content blockquote {height: 100px}
-
-#content form, #content fieldset {position:relative}
-#left-column li a, #left-column li strong {height:1%}
-
-#content .coloured, #content .data {border-spacing: expression(cellSpacing=1); /* for IE */}
-
-#left-column {word-wrap: break-word}
-
-
-.required {vertical-align: top; padding-top: 0;}
-
diff --git a/web/cobrands/barnet/css/layout.css b/web/cobrands/barnet/css/layout.css
index 1e1bf5d05..cad46b039 100644
--- a/web/cobrands/barnet/css/layout.css
+++ b/web/cobrands/barnet/css/layout.css
@@ -1,7 +1,8 @@
 /* FixMyStreet additions */
 /* Smaller map */
-#mysociety #map_box {
+#mysociety #map_box { 
     width: 380px;
+    margin-bottom: 8px;
 }
 #mysociety #map, #mysociety #drag {
     width: 378px;
@@ -13,6 +14,23 @@
     width: auto;
 }
 
+#mysociety textarea {
+    border: 1px solid #999999;
+}
+
+/* fix (for the reports page) */
+#content #mysociety h1 span {
+    display: inline;
+    border: none;
+    padding: 0;
+}
+
+#mysociety #postcodeForm {
+    background-color: #E9E9EA;
+}
+#mysociety #postcodeForm label {
+    width: 100%;
+}
 /*=========FROM CUSTOM=========*/
 .cl  {clear: both;}
     
@@ -70,61 +88,6 @@ h3, h4, h5, p, ol, ul, table, dl, address, form {margin-right: 5px; margin-left:
 h1, h2 {padding-left: 5px}
 */
 
-    /* Navigation */
-
-#left-column h2 {
-    margin:0 5px 15px 40px;
-    padding: 6px 0 0 25px;
-    font-size:1.245em;
-    line-height:1.1em;
-    background-repeat: no-repeat;
-    background-position: top left;
-    }
-
-#navigation h2 {font-size:1.692em; font-weight:normal; padding: 10px 0 6px 40px}
-
-#left-column div {margin-bottom:5px; padding: 5px 0 15px 0}
-
-#left-column ul, #left-column dl {
-    margin:0;
-    padding:0 0 0 35px;
-    font-size: 1.08em
-    }
-
-#left-column dl {padding: 0 5px 5px 40px}
-#left-column dt {margin: 10px 0 0 0}
-#left-column dd {padding:0; line-height:1.3em}
-
-#left-column dl a {
-    text-decoration:underline;
-    color:#000;
-    }
-#left-column dl a:hover {text-decoration: none}
-
-#left-column ul ul {
-    padding-left: 0;
-    font-size: 1em
-    }
-
-#left-column li {padding:0; margin:0}
-
-#left-column li a, #left-column li strong {
-    padding: 5px 5px 5px 20px;
-    display:block;
-    background-repeat: no-repeat;
-    background-position: 10px 11px;
-    font-style: normal;
-    font-weight: normal;
-    text-decoration:none;
-    color:#000;
-    }
-
-#left-column li a:hover {text-decoration:underline}
-
-#left-column li li a, #left-column li li strong {padding-left:30px; background-position: 20px 11px;}
-#left-column li li li a, #left-column li li li strong {padding-left:40px; background-position: 30px 11px;}
-#left-column li li li li a, #left-column li li li li strong {padding-left:50px; background-position: 40px 11px;}
-#left-column li li li li li a, #left-column li li li li li strong {padding-left:60px; background-position: 50px 11px;}
 
 /*=== Quotes =====*/
 #content blockquote {margin:10px; min-height: 90px; padding-bottom: 10px}
@@ -170,229 +133,11 @@ legend {
     font-weight:bold
     }
    
-/*=======form fields and labels=========*/
-
-/*
-#content label, form p, #content input, #content select, #content textarea, form .long-label {
-    margin-bottom: 0.25em;
-    margin-top: 0.25em;
-    }
 
-#content form label {
-    font-weight: bold;
-    padding-right: 10px;
-    width: 10em;
-    float: left;
-    text-align: left;
-    color: #000;
-    margin-top:10px
-    }
-
-#content form .radio label, #content form .checkbox label {font-weight:normal; margin-top:0}
-
-form p, form h3 {margin-left:0}
-form p {font-weight: bold}
-*/
 
 /*======= wide rows ======= */
 #content textarea {padding: 5px;}
 
-/*====Required styling====*/
-.required {
-    font-size:200%;
-    padding:7px 0 0 0;
-    line-height:0;
-    vertical-align:middle;
-    color:#008184
-    }
-
-/*=========Header=========*/
-
-#header{
-    padding: 0;
-    margin: 0;
-    min-height: 80px;
-    text-align: center
-    }
-
-#header {background: #34a3a4 url(../images/header-bg.gif) repeat-x bottom left;}
-#header img {position: absolute; top:8px; left: 37px}
-
-#header form {
-    width: 320px;
-    text-align: left;
-    margin:0 auto;
-    padding: 20px 0 0 0;
-    }
-
-#header form div {float:left}
-
-#header form .search-input {background: url(../images/form-field_top.gif) no-repeat top left; padding:7px 0 0 0;}
-
-#header form .search-input input {
-    width:207px;
-    padding: 2px 5px 8px 5px;
-    font-size:0.923em;
-    color:#666666;
-    border:none;
-    background: url(../images/form-field_bottom.gif) no-repeat bottom left;
-    }
-
-#header form .search-button {
-    background: url(../images/search-button-top.gif) no-repeat top right;
-    margin:0 0 0 4px;
-    border-left: 1px solid #fff;
-    }
-#header form .search-button input {
-    border: none;
-    background: url(../images/search-button-bottom.gif) no-repeat bottom right;
-    padding: 3px 7px 8px 7px;
-    margin:4px 0 0 0;
-    font-weight:bold;
-    font-size:0.923em;
-    cursor: pointer
-    }
-
-/*======== Switcher ========*/
-#switcher {float:right; margin:-20px 47px 0 0; text-align: left; }
-
-#switcher p {
-    color: #fff;
-    font-weight:bold;
-    }
-
-#switcher li a, #switcher li strong {
-    background-repeat:no-repeat;
-    border:medium none;
-    outline-style:none;
-    outline-width:medium;
-    text-indent:-999em; 
-    }
-
-#switcher .default a, .default strong {background-image:url(../images/style-switcher_default.gif); }
-#switcher .relaxed-light a, .relaxed-light strong {background-image:url(../images/style-switcher_default-relaxed.gif); }
-#switcher .dark a, .dark strong {background-image:url(../images/style-switcher_dark.gif); }
-#switcher .relaxed-dark a, .relaxed-dark strong {background-image:url(../images/style-switcher_dark-relaxed.gif); }
-
-#switcher li a, #switcher li strong {
-    background-repeat:no-repeat;
-    border:medium none;
-    outline-style:none;
-    outline-width:medium;
-    text-indent:-999em;
-    }
-
-#switcher p {
-    font-size:1em;
-    margin: 0; 
-    padding:0;
-    width: auto; }
-
-#switcher ul {
-    list-style-type:none;
-    float:left;
-    margin:0;
-    padding:0;
-    width:auto;
-    }
-
-#switcher ul li {
-    float:left;
-    margin:0;
-    padding:0;
-    }
-
-#switcher li a, #switcher li strong {
-    display:block;
-    float:left;
-    height:30px;
-    margin:0;
-    width:44px; }
-
-#switcher strong {background-position:0 -60px; }
-#switcher li a:focus, #switcher li a:active, #switcher a:hover {background-position:0 -30px; }
 
-/*== Homepage Right Column ==*/
-
-.browse-aloud p, p.browse-aloud {background: url('../images/logo-browse-aloud.gif') no-repeat 10px 0;}
-.browse-aloud p {
-    font-size:1.235em;
-    padding: 0 9px 0 60px;
-    margin:10px 0 0 0;
-    line-height:1.3em
-    }
-
-p.browse-aloud {
-	padding: 10px 0 5px 45px;
-	margin: 0 5px -10px 40px;
-	background-position: 0 10px;
-	border-top: 1px solid #CC6666;
-	}
-
-p.browse-aloud a {color:#34020b}
-
-/*====Pre-Footer====*/
-
-#pre-footer {padding: 0 35px;}
-#pre-footer div {padding: 0}
-
-#pre-footer .box-left {width: 66.66%; padding:0; margin:0}
-#pre-footer .box-right {width: 33.33%; padding: 0; margin:0}
-
-#pre-footer dl {margin:0; padding:0; float:left; width:25%; font-size:0.85em}
-#pre-footer dt {margin: 10px 0 0 0}
-
-#pre-footer dt, #pre-footer dd {padding: 0 0 0 10px}
-
-#pre-footer .box-right div {padding: 10px}
-#pre-footer h2 {font-size:1em; border:none; padding:0; margin:0}
-
-#pre-footer .box-right div {
-    min-height:115px;
-    border-top:none; 
-    border-bottom:none;
-    margin-right:0;
-    position:relative;
-    overflow:hidden
-    }
-
-#pre-footer ul, #pre-footer p, #pre-footer li {margin:0; padding:0}
-#pre-footer ul, #pre-footer h2, #pre-footer p {margin-left:110px}
-#pre-footer img {position:absolute; left:10px; top:10px}
-
-#pre-footer .box-right div.social-bookmarking {padding: 10px 15px}
-#pre-footer .social-bookmarking ul, #pre-footer .social-bookmarking h2, #pre-footer .social-bookmarking p {margin:0;}
-#pre-footer .social-bookmarking ul {margin: 8px 0 3px 0; overflow:hidden; width:100%}
-#pre-footer .social-bookmarking ul li {width: 49%; float:left; margin: 0 0 3px 0}
-#pre-footer .social-bookmarking ul li a {
-    padding: 2px 0 2px 21px;
-    background-position:0 3px;
-    background-repeat: no-repeat;
-    }
-
-#pre-footer .social-bookmarking h2 {color:#000}
-#pre-footer .social-bookmarking p {font-size: 0.85em}
-
-#pre-footer .social-bookmarking ul li.facebook a {background-image: url('../images/social-facebook.gif')}
-#pre-footer .social-bookmarking ul li.technorati a {background-image: url('../images/social-technorati.gif')}
-#pre-footer .social-bookmarking ul li.delicious a {background-image: url('../images/social-delicious.gif')}
-#pre-footer .social-bookmarking ul li.stumbleupon a {background-image: url('../images/social-stumbleupon.gif')}
-#pre-footer .social-bookmarking ul li.google a {background-image: url('../images/social-google.gif')}
-#pre-footer .social-bookmarking ul li.digg a {background-image: url('../images/social-digg.gif')}
-
-
-
-/*====Footer====*/
-
-#footer {
-    clear: both;
-    padding: 5px;
-    margin:5px 0 0 0;
-    }
-#footer ul {margin: 0 25px}
-#footer li {display:inline}
 
-/*== Footer colours + customisations ==*/
-#footer {background: #34a3a4 url(../images/header-bg.gif) repeat-x bottom left;}
-#footer a, #footer a:link {color:#fff}
 
diff --git a/web/cobrands/barnet/css/light.css b/web/cobrands/barnet/css/light.css
deleted file mode 100644
index 62dc7e17d..000000000
--- a/web/cobrands/barnet/css/light.css
+++ /dev/null
@@ -1,142 +0,0 @@
-/*====== Light Colours and Images ======*/
-
-
-/*==  Homepage Colours and Custimisations ==*/
-
-.online-services h2, .a-z h2 {
-    background-image: url('../images/icon-online-services.png');
-    color: #663333;
-    border-color: #cc6666;
-    }
-.a-z h2 {background:none}
-.online-services li a {background: url(../images/arrow-red.gif) no-repeat 6px 10px}
-#col-left .online-services li a, #col-left .online-services li a:link {color:#000}
-.whats-on div, .council-meetings div {
-    background-color: #e5e5e5;
-    border-bottom:1px solid #000;
-    }
-
-#col-left .whats-on h2 a, #col-left .council-meetings h2 a {color:#000}
-.whats-on div {background-image: url('../images/icon-whats-on.png');}
-.council-meetings div {background-image: url('../images/icon-council-meetings.png');}
-
-.media li {border-bottom:1px solid #e5e5e5}
-.media p span {color:#666;}
-
-/* Homepage Highlights and Media*/
-
-.highlights h2 {
-    background-image: url('../images/icon-highlights.png');
-    border-color: #ffc000;
-    }
-.highlights h2, #col-left .highlights a {color: #996600;}
-
-.media h2 {
-    background-image: url('../images/icon-media-centre.png');
-    border-color: #591cca;
-    }
-.media h2, #col-left .media a {color: #6633cc;}
-
-#col-left .whats-on h2 .feed {background-image: url('../images/rss-whats-on.gif')}
-#col-left .highlights h2 .feed {background-image: url('../images/rss-highlights.gif')}
-#col-left .media h2 .feed {background-image: url('../images/rss-media.gif')}
-
-#col-left .a-z li a {color:#000; background: #d0e7e7}
-#col-left .a-z li a:hover {background: #f3e7e7}
-
-.link-bar {background: #e5e5e5; border-bottom: 1px solid #000}
-#col-left .link-bar a {color:#000}
-
-/*==== Homepage Tabs Colours and Custimisations ====*/
-
-#col-right, #col-right div, #iewrap #col-right .useful-links ul {background: url('../images/related-bg.gif');}
-
-#col-right a, #col-right a:link {color: #330000}
-
-#col-right ul {border-top: 1px solid #cc6666;}
-
-#col-right li a.leader-listens {background-image: url('../images/link-images/logo-leader-listens.gif')}
-#col-right li a.whereilive {background-image: url('../images/link-images/logo-whereilive.gif')}
-#col-right li a.facebook {background-image: url('../images/link-images/logo-facebook.gif')}
-#col-right li a.twitter {background-image: url('../images/link-images/logo-twitter.gif')}
-#col-right li a.you-tube {background-image: url('../images/link-images/logo-youtube.gif')}
-#col-right li a.flickr {background-image: url('../images/link-images/logo-flickr.gif')}
-
-#col-right li a.base {background-image: url('../images/link-images/logo-base.gif')}
-#col-right li a.direct-me {background-image: url('../images/link-images/logo-directme.gif')}
-#col-right li a.directgov {background-image: url('../images/link-images/logo-directgov.gif')}
-#col-right li a.support-people {background-image: url('../images/link-images/logo-supporting-people.gif')}
-
-
-#col-right ul ul {
-    border-color: #eed0d0;
-    background: #fff;
-    }
-
-#col-right li a.tab-on {
-    background-color:#fff;
-    border-color: #eed0d0;
-    }
-
-
-/*=== Content Page Layout :: Colours and Customisations===*/
-
-#content{border: 1px solid #d6eaea; border-width: 0 1px 0 1px}
-#wrap {background: url(../images/wrap-border.gif) repeat-y 35px 0;}
-
-/*=== Content Page Layout Elements :: Colours and Customisations===*/
-
-h1, h2 {border-bottom: 1px solid #008184; color:#003333}
-h3, h4, h5 {color:#003333}
-
-#content a:focus, #content a:active {color:#fff; background: #008184; }
-
-#content blockquote, #content q {
-    background: #d8ebeb url('../images/quote.gif') no-repeat 10px 10px;
-    border: 1px solid #008184;
-    border-width: 1px 0
-    }
-#content q {background-image:none}
-
-#content ul li {background: url('../images/arrow-green-small.gif') no-repeat 5px 5px}
-#content ul li ol li {background: none}
-#content ul li ul li, #content ol li ul li {background: url('../images/arrow-hyphen-small.gif') no-repeat 3px 10px}
-
-th {background:#008184; color:#fff}
-tr td {background:#f0f7f7}
-tr.even td {background:#d1e8e8}
-table.data td, table.data th {border-right: 3px solid #fff}
-
-    /* Navigation colours */
-
-#left-column #navigation, #left-column #online-services, #left-column #useful-links, #left-column #contact {
-    background-image: url(../images/main-prop-border.gif);
-    background-position: 35px 0;
-    background-repeat: repeat-y;
-    }
-
-#left-column #navigation {background-color:#d8ebeb}
-#left-column #online-services {background-color:#f9f3f3}
-#left-column #useful-links, #left-column #contact {background-color:#e6e6e6}
-
-#left-column #navigation h2 {color: #003333; border-color: #008184; background-image: url('../images/icon-welcome.gif')}
-#left-column #online-services h2 {color:#663333; border-color: #cc6666; background-image: url('../images/icon-online-services-small.gif')}
-#left-column #useful-links h2, #left-column #contact h2 {color:#000; border-color: #999999; background-image: url('../images/icon-useful-links-small.gif')}
-#left-column #contact h2 {background-image: url('../images/icon-contact-small.gif')}
-
-#left-column #navigation li a {background-image: url('../images/arrow-green-small.gif')}
-#left-column #online-services li a {background-image: url('../images/arrow-red-small.gif')}
-#left-column #useful-links li a {background-image: url('../images/arrow-grey-small.gif')}
-
-#left-column li li strong {background-image: url('../images/arrow-current-nav.gif'); background-color: #008184; color:#fff}
-#left-column #navigation li li li li li a {background-image: url('../images/arrow-hyphen-small.gif'); background-position: 50px 14px}
-
-    /* Forms colours */
-#content input[type|='text'] {border: 1px solid #008184}
-.error {color: #d04747}
-
-/*== Pre-Footer colours + customisations ==*/
-
-#pre-footer {background: #d4e9e9 url(../images/main-prop-border.gif) repeat-y 35px 0;}
-#pre-footer .box-right div {border: 1px solid #fff; border-bottom:medium none; border-top:medium none;}
-#pre-footer a, #pre-footer a:link {color:#000}
diff --git a/web/cobrands/barnet/css/print.css b/web/cobrands/barnet/css/print.css
deleted file mode 100644
index aee3a0139..000000000
--- a/web/cobrands/barnet/css/print.css
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-* {border-color:#000; color:#000 !important; background: none !important}
-
-#iewrap #print-logo {display:block !important}
-
-#iewrap #header, #iewrap #left-column, #iewrap #footer, #pre-footer .box-right, #iewrap #main-propostion,
-#iewrap #col-right {display:none; }
-
-#iewrap h1, #iewrap h2 {padding-left:0}
-
-#iewrap #col-left, #iewrap #pre-footer .box-left {width:100%;}
-#iewrap #pre-footer dl {width:33%;}
-
-#iewrap #wrap, #iewrap #col-wrapper, #iewrap #content, #pre-footer {margin:0; padding:0; border: none}
-\ No newline at end of file
diff --git a/web/cobrands/barnet/css/relaxed.css b/web/cobrands/barnet/css/relaxed.css
deleted file mode 100644
index 1b8226a56..000000000
--- a/web/cobrands/barnet/css/relaxed.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/*== RELAXED LAYOUT ==*/
-
-body {font-size:100%}
-#main-propostion #navigation-index {width:66.6%}
-#navigation-index li {margin:0}
-#main-propostion #proposition-image {width:33.3%}
-
-#iewrap #col-left, #iewrap #col-right {width:100%; float:none}
-
-#col-right {clear:both}
-#col-right .cl {display:none}
-
-#col-right .browse-aloud, #col-right .social-links, #col-right .useful-links {
-    float:left;
-    width:33.3%;
-    margin:0;
-    }
-
-#col-right .browse-aloud {background:none}
-#col-right {background:none; margin-top:10px;}
-
-.index .box-right h2, .media ul, .council-meetings div, .index .link-bar {margin-right:5px}
-
-#navigation-index li a, .online-services li a {background-position: 6px 10px}
-
-#col-right ul {border-top:none;}
-#iewrap #col-right ul {margin: 0 5px}
-#iewrap #col-right ul ul {margin: -1px 0 0 0}
-
-#iewrap #col-right .tab-on {margin-bottom:0}
-#iewrap #col-right ul .tab-2 ul {margin-left:-101.2%;}
-
-#iewrap #col-right .social-links, #iewrap #col-right .useful-links {min-height:0px; padding-bottom:5px}
-#iewrap #col-right .useful-links {background: none;}
-#iewrap #col-right .useful-links ul {margin: 0 5px 0 0; min-height:384px;}
-
-#iewrap #col-wrapper {border:1px solid #E1E7E7; border-top:none; border-bottom:0}
-#iewrap #pre-footer {margin:0}
-
-#pre-footer .box-right div {min-height:185px}
-
-#content form .sw, #content form .se, #content form .nw, #content form .ne {display:none}
-\ No newline at end of file
diff --git a/web/cobrands/barnet/images/arrow-current-nav.gif b/web/cobrands/barnet/images/arrow-current-nav.gif
deleted file mode 100644
index 5f3db021b..000000000
--- a/web/cobrands/barnet/images/arrow-current-nav.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/arrow-down.gif b/web/cobrands/barnet/images/arrow-down.gif
deleted file mode 100644
index e8a1aec59..000000000
--- a/web/cobrands/barnet/images/arrow-down.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/arrow-green-small.gif b/web/cobrands/barnet/images/arrow-green-small.gif
deleted file mode 100644
index 2e7f86ed7..000000000
--- a/web/cobrands/barnet/images/arrow-green-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/arrow-green.gif b/web/cobrands/barnet/images/arrow-green.gif
deleted file mode 100644
index 040ac271f..000000000
--- a/web/cobrands/barnet/images/arrow-green.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/arrow-grey-small.gif b/web/cobrands/barnet/images/arrow-grey-small.gif
deleted file mode 100644
index a4caf952d..000000000
--- a/web/cobrands/barnet/images/arrow-grey-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/arrow-hyphen-small.gif b/web/cobrands/barnet/images/arrow-hyphen-small.gif
deleted file mode 100644
index 2bde8518b..000000000
--- a/web/cobrands/barnet/images/arrow-hyphen-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/arrow-hyphen.gif b/web/cobrands/barnet/images/arrow-hyphen.gif
deleted file mode 100644
index c14a154ef..000000000
--- a/web/cobrands/barnet/images/arrow-hyphen.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/arrow-red-small.gif b/web/cobrands/barnet/images/arrow-red-small.gif
deleted file mode 100644
index f51fafc15..000000000
--- a/web/cobrands/barnet/images/arrow-red-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/arrow-red.gif b/web/cobrands/barnet/images/arrow-red.gif
deleted file mode 100644
index 611b2020f..000000000
--- a/web/cobrands/barnet/images/arrow-red.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/button-bg.gif b/web/cobrands/barnet/images/button-bg.gif
deleted file mode 100644
index f10081020..000000000
--- a/web/cobrands/barnet/images/button-bg.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/cnr-expanded-tab_ne.gif b/web/cobrands/barnet/images/cnr-expanded-tab_ne.gif
deleted file mode 100644
index c6c914865..000000000
--- a/web/cobrands/barnet/images/cnr-expanded-tab_ne.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/cnr-expanded-tab_nw.gif b/web/cobrands/barnet/images/cnr-expanded-tab_nw.gif
deleted file mode 100644
index 8bd637634..000000000
--- a/web/cobrands/barnet/images/cnr-expanded-tab_nw.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/cnr-expanded-tab_nw.png b/web/cobrands/barnet/images/cnr-expanded-tab_nw.png
deleted file mode 100644
index a58028725..000000000
--- a/web/cobrands/barnet/images/cnr-expanded-tab_nw.png
+++ /dev/null
diff --git a/web/cobrands/barnet/images/cnr-search-button.gif b/web/cobrands/barnet/images/cnr-search-button.gif
deleted file mode 100644
index 5dc3da24b..000000000
--- a/web/cobrands/barnet/images/cnr-search-button.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/arrow-green-small.gif b/web/cobrands/barnet/images/dark/arrow-green-small.gif
deleted file mode 100644
index 5c58d383d..000000000
--- a/web/cobrands/barnet/images/dark/arrow-green-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/arrow-green.gif b/web/cobrands/barnet/images/dark/arrow-green.gif
deleted file mode 100644
index 4564d3e06..000000000
--- a/web/cobrands/barnet/images/dark/arrow-green.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/arrow-grey-small.gif b/web/cobrands/barnet/images/dark/arrow-grey-small.gif
deleted file mode 100644
index 1b47cb21d..000000000
--- a/web/cobrands/barnet/images/dark/arrow-grey-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/arrow-red-small.gif b/web/cobrands/barnet/images/dark/arrow-red-small.gif
deleted file mode 100644
index f9c2e1cf5..000000000
--- a/web/cobrands/barnet/images/dark/arrow-red-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/arrow-red.gif b/web/cobrands/barnet/images/dark/arrow-red.gif
deleted file mode 100644
index b0c9d7d5d..000000000
--- a/web/cobrands/barnet/images/dark/arrow-red.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/cnr-expanded-tab_ne.gif b/web/cobrands/barnet/images/dark/cnr-expanded-tab_ne.gif
deleted file mode 100644
index 7d2ef2d9e..000000000
--- a/web/cobrands/barnet/images/dark/cnr-expanded-tab_ne.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.gif b/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.gif
deleted file mode 100644
index 03f1e20dd..000000000
--- a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.png b/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.png
deleted file mode 100644
index 66d9ec0f5..000000000
--- a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.png
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/cnr-search-button.gif b/web/cobrands/barnet/images/dark/cnr-search-button.gif
deleted file mode 100644
index 7bdb7ba0c..000000000
--- a/web/cobrands/barnet/images/dark/cnr-search-button.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/grey-border.gif b/web/cobrands/barnet/images/dark/grey-border.gif
deleted file mode 100644
index d01106f1a..000000000
--- a/web/cobrands/barnet/images/dark/grey-border.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/icon-contact-small.gif b/web/cobrands/barnet/images/dark/icon-contact-small.gif
deleted file mode 100644
index 36b258e1d..000000000
--- a/web/cobrands/barnet/images/dark/icon-contact-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/icon-council-meetings.gif b/web/cobrands/barnet/images/dark/icon-council-meetings.gif
deleted file mode 100644
index 80faa8dda..000000000
--- a/web/cobrands/barnet/images/dark/icon-council-meetings.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/icon-highlights.gif b/web/cobrands/barnet/images/dark/icon-highlights.gif
deleted file mode 100644
index 682b66416..000000000
--- a/web/cobrands/barnet/images/dark/icon-highlights.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/icon-media-centre.gif b/web/cobrands/barnet/images/dark/icon-media-centre.gif
deleted file mode 100644
index 4a0c3269f..000000000
--- a/web/cobrands/barnet/images/dark/icon-media-centre.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/icon-online-services-small.gif b/web/cobrands/barnet/images/dark/icon-online-services-small.gif
deleted file mode 100644
index 59c969735..000000000
--- a/web/cobrands/barnet/images/dark/icon-online-services-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/icon-online-services.gif b/web/cobrands/barnet/images/dark/icon-online-services.gif
deleted file mode 100644
index ff4bc93fe..000000000
--- a/web/cobrands/barnet/images/dark/icon-online-services.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/icon-useful-links-small.gif b/web/cobrands/barnet/images/dark/icon-useful-links-small.gif
deleted file mode 100644
index 589550b80..000000000
--- a/web/cobrands/barnet/images/dark/icon-useful-links-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/icon-welcome.gif b/web/cobrands/barnet/images/dark/icon-welcome.gif
deleted file mode 100644
index 85afa6fa8..000000000
--- a/web/cobrands/barnet/images/dark/icon-welcome.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/icon-whats-on.gif b/web/cobrands/barnet/images/dark/icon-whats-on.gif
deleted file mode 100644
index e7d028a80..000000000
--- a/web/cobrands/barnet/images/dark/icon-whats-on.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/main-prop-border.gif b/web/cobrands/barnet/images/dark/main-prop-border.gif
deleted file mode 100644
index 192c20d28..000000000
--- a/web/cobrands/barnet/images/dark/main-prop-border.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/quote.gif b/web/cobrands/barnet/images/dark/quote.gif
deleted file mode 100644
index d9a4f7496..000000000
--- a/web/cobrands/barnet/images/dark/quote.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/red-border.gif b/web/cobrands/barnet/images/dark/red-border.gif
deleted file mode 100644
index c8b56fa8c..000000000
--- a/web/cobrands/barnet/images/dark/red-border.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/related-bg.gif b/web/cobrands/barnet/images/dark/related-bg.gif
deleted file mode 100644
index 7cd7cef31..000000000
--- a/web/cobrands/barnet/images/dark/related-bg.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/rss-highlights.gif b/web/cobrands/barnet/images/dark/rss-highlights.gif
deleted file mode 100644
index dd7b416f0..000000000
--- a/web/cobrands/barnet/images/dark/rss-highlights.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/rss-media.gif b/web/cobrands/barnet/images/dark/rss-media.gif
deleted file mode 100644
index 273c8c5f9..000000000
--- a/web/cobrands/barnet/images/dark/rss-media.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/rss-whats-on.gif b/web/cobrands/barnet/images/dark/rss-whats-on.gif
deleted file mode 100644
index 60b752c8c..000000000
--- a/web/cobrands/barnet/images/dark/rss-whats-on.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/social-delicious.gif b/web/cobrands/barnet/images/dark/social-delicious.gif
deleted file mode 100644
index 98955d90b..000000000
--- a/web/cobrands/barnet/images/dark/social-delicious.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/social-digg.gif b/web/cobrands/barnet/images/dark/social-digg.gif
deleted file mode 100644
index b33602377..000000000
--- a/web/cobrands/barnet/images/dark/social-digg.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/social-facebook.gif b/web/cobrands/barnet/images/dark/social-facebook.gif
deleted file mode 100644
index 072e5ac2d..000000000
--- a/web/cobrands/barnet/images/dark/social-facebook.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/social-google.gif b/web/cobrands/barnet/images/dark/social-google.gif
deleted file mode 100644
index a3a11b3ce..000000000
--- a/web/cobrands/barnet/images/dark/social-google.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/social-stumbleupon.gif b/web/cobrands/barnet/images/dark/social-stumbleupon.gif
deleted file mode 100644
index b9c4a1088..000000000
--- a/web/cobrands/barnet/images/dark/social-stumbleupon.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/social-technorati.gif b/web/cobrands/barnet/images/dark/social-technorati.gif
deleted file mode 100644
index 0b7d2e299..000000000
--- a/web/cobrands/barnet/images/dark/social-technorati.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/dark/wrap-border.gif b/web/cobrands/barnet/images/dark/wrap-border.gif
deleted file mode 100644
index cf8c3d319..000000000
--- a/web/cobrands/barnet/images/dark/wrap-border.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/expanded-tab.png b/web/cobrands/barnet/images/expanded-tab.png
deleted file mode 100644
index df8dd66b4..000000000
--- a/web/cobrands/barnet/images/expanded-tab.png
+++ /dev/null
diff --git a/web/cobrands/barnet/images/form-field_bottom.gif b/web/cobrands/barnet/images/form-field_bottom.gif
deleted file mode 100644
index 63ec4d121..000000000
--- a/web/cobrands/barnet/images/form-field_bottom.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/form-field_top.gif b/web/cobrands/barnet/images/form-field_top.gif
deleted file mode 100644
index a7b7e0d52..000000000
--- a/web/cobrands/barnet/images/form-field_top.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/header-bg.gif b/web/cobrands/barnet/images/header-bg.gif
deleted file mode 100644
index 5e6a72ef9..000000000
--- a/web/cobrands/barnet/images/header-bg.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-contact-small.gif b/web/cobrands/barnet/images/icon-contact-small.gif
deleted file mode 100644
index efed060d1..000000000
--- a/web/cobrands/barnet/images/icon-contact-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-council-meetings.gif b/web/cobrands/barnet/images/icon-council-meetings.gif
deleted file mode 100644
index 1eca7dc68..000000000
--- a/web/cobrands/barnet/images/icon-council-meetings.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-council-meetings.png b/web/cobrands/barnet/images/icon-council-meetings.png
deleted file mode 100644
index 28e0aea75..000000000
--- a/web/cobrands/barnet/images/icon-council-meetings.png
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-highlights.gif b/web/cobrands/barnet/images/icon-highlights.gif
deleted file mode 100644
index e9b079445..000000000
--- a/web/cobrands/barnet/images/icon-highlights.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-highlights.png b/web/cobrands/barnet/images/icon-highlights.png
deleted file mode 100644
index d812a2ad9..000000000
--- a/web/cobrands/barnet/images/icon-highlights.png
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-media-centre.gif b/web/cobrands/barnet/images/icon-media-centre.gif
deleted file mode 100644
index b37eb9606..000000000
--- a/web/cobrands/barnet/images/icon-media-centre.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-media-centre.png b/web/cobrands/barnet/images/icon-media-centre.png
deleted file mode 100644
index 5e1741618..000000000
--- a/web/cobrands/barnet/images/icon-media-centre.png
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-online-services-small.gif b/web/cobrands/barnet/images/icon-online-services-small.gif
deleted file mode 100644
index 19f1c7d4e..000000000
--- a/web/cobrands/barnet/images/icon-online-services-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-online-services.gif b/web/cobrands/barnet/images/icon-online-services.gif
deleted file mode 100644
index 1d79fb14b..000000000
--- a/web/cobrands/barnet/images/icon-online-services.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-online-services.png b/web/cobrands/barnet/images/icon-online-services.png
deleted file mode 100644
index ef0297af7..000000000
--- a/web/cobrands/barnet/images/icon-online-services.png
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-useful-links-small.gif b/web/cobrands/barnet/images/icon-useful-links-small.gif
deleted file mode 100644
index 1c4566127..000000000
--- a/web/cobrands/barnet/images/icon-useful-links-small.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-welcome.gif b/web/cobrands/barnet/images/icon-welcome.gif
deleted file mode 100644
index 24c603a4a..000000000
--- a/web/cobrands/barnet/images/icon-welcome.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-welcome.png b/web/cobrands/barnet/images/icon-welcome.png
deleted file mode 100644
index e6fb3c46a..000000000
--- a/web/cobrands/barnet/images/icon-welcome.png
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-whats-on.gif b/web/cobrands/barnet/images/icon-whats-on.gif
deleted file mode 100644
index df96259a5..000000000
--- a/web/cobrands/barnet/images/icon-whats-on.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/icon-whats-on.png b/web/cobrands/barnet/images/icon-whats-on.png
deleted file mode 100644
index bba974359..000000000
--- a/web/cobrands/barnet/images/icon-whats-on.png
+++ /dev/null
diff --git a/web/cobrands/barnet/images/logo-barnet.gif b/web/cobrands/barnet/images/logo-barnet.gif
deleted file mode 100644
index 5bcb70bb0..000000000
--- a/web/cobrands/barnet/images/logo-barnet.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/logo-browse-aloud.gif b/web/cobrands/barnet/images/logo-browse-aloud.gif
deleted file mode 100644
index 16d51b63e..000000000
--- a/web/cobrands/barnet/images/logo-browse-aloud.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/main-prop-border.gif b/web/cobrands/barnet/images/main-prop-border.gif
deleted file mode 100644
index 2799b45c6..000000000
--- a/web/cobrands/barnet/images/main-prop-border.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/navigation-bg.gif b/web/cobrands/barnet/images/navigation-bg.gif
deleted file mode 100644
index 4abcb5896..000000000
--- a/web/cobrands/barnet/images/navigation-bg.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/prop-bg.png b/web/cobrands/barnet/images/prop-bg.png
deleted file mode 100644
index eee3d4329..000000000
--- a/web/cobrands/barnet/images/prop-bg.png
+++ /dev/null
diff --git a/web/cobrands/barnet/images/quote.gif b/web/cobrands/barnet/images/quote.gif
deleted file mode 100644
index cbcd770f8..000000000
--- a/web/cobrands/barnet/images/quote.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/related-bg.gif b/web/cobrands/barnet/images/related-bg.gif
deleted file mode 100644
index 58c9f731a..000000000
--- a/web/cobrands/barnet/images/related-bg.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/rss-highlights.gif b/web/cobrands/barnet/images/rss-highlights.gif
deleted file mode 100644
index 4a938a86d..000000000
--- a/web/cobrands/barnet/images/rss-highlights.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/rss-media.gif b/web/cobrands/barnet/images/rss-media.gif
deleted file mode 100644
index 4e3f55f87..000000000
--- a/web/cobrands/barnet/images/rss-media.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/rss-whats-on.gif b/web/cobrands/barnet/images/rss-whats-on.gif
deleted file mode 100644
index d4f44b861..000000000
--- a/web/cobrands/barnet/images/rss-whats-on.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/search-button-bottom.gif b/web/cobrands/barnet/images/search-button-bottom.gif
deleted file mode 100644
index ae6404966..000000000
--- a/web/cobrands/barnet/images/search-button-bottom.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/search-button-top.gif b/web/cobrands/barnet/images/search-button-top.gif
deleted file mode 100644
index bf4a13e0b..000000000
--- a/web/cobrands/barnet/images/search-button-top.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/social-delicious.gif b/web/cobrands/barnet/images/social-delicious.gif
deleted file mode 100644
index 0f243ea90..000000000
--- a/web/cobrands/barnet/images/social-delicious.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/social-digg.gif b/web/cobrands/barnet/images/social-digg.gif
deleted file mode 100644
index c836d1412..000000000
--- a/web/cobrands/barnet/images/social-digg.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/social-facebook.gif b/web/cobrands/barnet/images/social-facebook.gif
deleted file mode 100644
index 96eef255f..000000000
--- a/web/cobrands/barnet/images/social-facebook.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/social-google.gif b/web/cobrands/barnet/images/social-google.gif
deleted file mode 100644
index 491a23adf..000000000
--- a/web/cobrands/barnet/images/social-google.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/social-stumbleupon.gif b/web/cobrands/barnet/images/social-stumbleupon.gif
deleted file mode 100644
index 8d24d01f4..000000000
--- a/web/cobrands/barnet/images/social-stumbleupon.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/social-technorati.gif b/web/cobrands/barnet/images/social-technorati.gif
deleted file mode 100644
index ab83181b9..000000000
--- a/web/cobrands/barnet/images/social-technorati.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/style-switcher_dark-relaxed.gif b/web/cobrands/barnet/images/style-switcher_dark-relaxed.gif
deleted file mode 100644
index e94c93959..000000000
--- a/web/cobrands/barnet/images/style-switcher_dark-relaxed.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/style-switcher_dark.gif b/web/cobrands/barnet/images/style-switcher_dark.gif
deleted file mode 100644
index 094115ecd..000000000
--- a/web/cobrands/barnet/images/style-switcher_dark.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/style-switcher_default-relaxed.gif b/web/cobrands/barnet/images/style-switcher_default-relaxed.gif
deleted file mode 100644
index 7bb6f7df9..000000000
--- a/web/cobrands/barnet/images/style-switcher_default-relaxed.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/style-switcher_default.gif b/web/cobrands/barnet/images/style-switcher_default.gif
deleted file mode 100644
index 9e932af2f..000000000
--- a/web/cobrands/barnet/images/style-switcher_default.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/images/wrap-border.gif b/web/cobrands/barnet/images/wrap-border.gif
deleted file mode 100644
index eb5ff2330..000000000
--- a/web/cobrands/barnet/images/wrap-border.gif
+++ /dev/null
diff --git a/web/cobrands/barnet/javascript/2008-portsurf.js b/web/cobrands/barnet/javascript/2008-portsurf.js
deleted file mode 100644
index f9253a25a..000000000
--- a/web/cobrands/barnet/javascript/2008-portsurf.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
-* Portsurf Ltd functions
-**/
-
-function resetMarkers(){
-	$("#s1:first-child").html("default");
-	$("#s2:first-child").html("relaxed light");
-	$("#s3:first-child").html("dark");
-	$("#s4:first-child").html("relaxed dark");
-}
-
-$(document).ready(function(){
-	
-	/**
-	* Show the style switcher - it's hidden without javascript
-	**/
-	$("#switcher").show();
-	
-	
-	/**
-	* Clear the search box
-	**/
-	$(".search").focus(function(){
-		if(this.value=="Please enter your search"){
-			this.value="";
-		}
-	});
-	
-	/**
-	* Highlight the appropriate style preference
-	**/
-
-		
-		/**
-		* Page loads
-		**/	
-		
-		// reset markers first
-		resetMarkers();
-		
-		// set markers
-		var sty=$.cookie('style');
-		switch(sty){
-			case "default":
-				$("#s1:first-child").html("<strong>default</strong>");
-				break;
-				
-			case "relaxed light":
-				$("#s2:first-child").html("<strong>relaxed light</strong>");
-				break;
-				
-			case "dark":
-				$("#s3:first-child").html("<strong>dark</strong>");
-				break;
-				
-			case "relaxed dark":
-				$("#s4:first-child").html("<strong>relaxed dark</strong>");
-				break;
-				
-			default:
-				$("#s1:first-child").html("<strong>default</strong>");
-				break;
-				
-		}
-
-		/**
-		* Clicks
-		**/
-		
-		$("#s1").click(function(){
-			resetMarkers();
-			$("#s1:first-child").html("<strong>default</strong>");
-		});
-		
-		$("#s2").click(function(){
-			resetMarkers();
-			$("#s2:first-child").html("<strong>relaxed light</strong>");
-		});	
-		
-		$("#s3").click(function(){
-			resetMarkers();
-			$("#s3:first-child").html("<strong>dark</strong>");
-		});	
-		
-		$("#s4").click(function(){
-			resetMarkers();
-			$("#s4:first-child").html("<strong>relaxed dark</strong>");
-		});
-	
-	// Intentionally blank due to fake indenting...
-	
-});
-
diff --git a/web/cobrands/barnet/javascript/jquery-1.2.6_common.js b/web/cobrands/barnet/javascript/jquery-1.2.6_common.js
deleted file mode 100644
index 7b09750cc..000000000
--- a/web/cobrands/barnet/javascript/jquery-1.2.6_common.js
+++ /dev/null
@@ -1,31 +0,0 @@
-//jQuery 1.2.6
-(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
-return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
-return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
-selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
-return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
-this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
-return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
-jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
-script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
-for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
-for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
-jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
-ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
-while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
-while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
-for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
-jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
-xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
-jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
-for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
-s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
-e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
-
-// Cookies
-function createCookie(name,value,days){if(days){var date=new Date();date.setTime(date.getTime()+(days*24*60*60*1000));var expires="; expires="+date.toGMTString();}
-else var expires="";document.cookie=name+"="+value+expires+"; path=/";}
-function readCookie(name){var nameEQ=name+"=";var ca=document.cookie.split(';');for(var i=0;i<ca.length;i++){var c=ca[i];while(c.charAt(0)==' ')c=c.substring(1,c.length);if(c.indexOf(nameEQ)==0)return c.substring(nameEQ.length,c.length);}
-return null;}
-function eraseCookie(name){createCookie(name,"",-1);}
-
diff --git a/web/cobrands/barnet/javascript/jquery-cookie-min.js b/web/cobrands/barnet/javascript/jquery-cookie-min.js
deleted file mode 100644
index 37fe78ad6..000000000
--- a/web/cobrands/barnet/javascript/jquery-cookie-min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Cookie plugin
- *
- * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- */
-jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options=options||{};if(value===null){value='';options.expires=-1;}var expires='';if(options.expires&&(typeof options.expires=='number'||options.expires.toUTCString)){var date;if(typeof options.expires=='number'){date=new Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000));}else{date=options.expires;}expires='; expires='+date.toUTCString();}var path=options.path?'; path='+(options.path):'';var domain=options.domain?'; domain='+(options.domain):'';var secure=options.secure?'; secure':'';document.cookie=[name,'=',encodeURIComponent(value),expires,path,domain,secure].join('');}else{var cookieValue=null;if(document.cookie&&document.cookie!=''){var cookies=document.cookie.split(';');for(var i=0;i<cookies.length;i++){var cookie=jQuery.trim(cookies[i]);if(cookie.substring(0,name.length+1)==(name+'=')){cookieValue=decodeURIComponent(cookie.substring(name.length+1));break;}}}return cookieValue;}};
-\ No newline at end of file
diff --git a/web/cobrands/barnet/javascript/styleswitch.js b/web/cobrands/barnet/javascript/styleswitch.js
deleted file mode 100644
index c4afb0b28..000000000
--- a/web/cobrands/barnet/javascript/styleswitch.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
-* Styleswitch stylesheet switcher built on jQuery
-* Under an Attribution, Share Alike License
-* By Kelvin Luck ( http://www.kelvinluck.com/ )
-**/
-
-$(document).ready(function() {
-	$('.styleswitch').click(function()
-	{
-		switchStylestyle(this.getAttribute("rel"));
-		return false;
-	});
-	var c = readCookie('style');
-	if (c) switchStylestyle(c);
-});
-
-function switchStylestyle(styleName)
-{
-	$('link[@rel*=style][@title]').each(function(i) 
-	{
-		this.disabled = true;
-		if (this.getAttribute('title') == styleName) this.disabled = false;
-	});
-	createCookie('style', styleName, 365);
-}
-
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss
index f9e5051ba..8e1a3ccfa 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/fixmystreet/_base.scss
@@ -1,7 +1,7 @@
 /* HEADINGS and TYPOGRAPHY */
 
 body {
-  font-family: 'MuseoSans', 'Helvetica', 'Arial', sans-serif;
+  font-family: MuseoSans, Helmet, Freesans, sans-serif;
   margin:0;
   font-size:1em;
   line-height:1.5;
@@ -17,14 +17,14 @@ p {
 }
 
 small{
-  font-family: 'helvetica', 'arial',sans-serif;
+  font-family: Helmet, Freesans, sans-serif;
   font-style: italic;
   font-size: 0.8125em;
   line-height: 1.2307em;
 }
 
 h1 {
-  font-family:'Museo300-display', 'Helvetica', 'Arial', sans-serif;
+  font-family: 'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif;
   font-size: 2em;
   line-height: 1em;
   font-weight: normal;
@@ -40,7 +40,7 @@ h1#reports_heading a {
 }
 
 h2 {
-  font-family:'Museo300-display', 'Helvetica', 'Arial', sans-serif;
+  font-family:'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif;
   font-size: 1.5em; /*24px*/
   line-height: 1.3333em; /*32px*/
   font-weight: normal;
@@ -53,12 +53,12 @@ h3 {
   line-height: 1.20em;
   margin-top: 1.2em;
   margin-bottom: 0.8em;
-  font-weight: bold
+  font-weight: normal;
 }
 
 h4 {
   font-size: 1em;
-  font-weight: bold;
+  font-weight: normal;
   margin-bottom: 1em; 
 }
 
@@ -102,7 +102,7 @@ ol.big-numbers {
       color:#ccc;
       line-height:1;
       font: {
-        family: 'helvetica', 'arial', sans-serif;
+        family: Helmet, Freesans, sans-serif;
         weight:bold;
         size:2.5em;
       }
@@ -151,7 +151,10 @@ img {
 
 select, input, textarea {
   font-size: 99%;
-  max-width: 100%;
+  max-width: 95%;
+}
+// To deal with bug from drop-down being wider than holder
+select {
   width: 100%;
 }
 
@@ -179,14 +182,14 @@ a:visited {
   margin-bottom: 0px;
 }
 .meta-2{
-  font-family: 'helvetica', 'arial',sans-serif;
+  font-family: Helmet, Freesans, sans-serif;
   color:#666666;
   font-style: italic;
   font-size: 0.75em;
 }
 
 h4.static{
-  font-family: 'helvetica', 'arial',sans-serif;
+  font-family: Helmet, Freesans, sans-serif;
   text-transform: uppercase;
   font-size: 0.875em;
   line-height: 1.71428em;
@@ -267,7 +270,7 @@ textarea {
   display: block;
   font-size: 1em;
   line-height: 1.5em;
-  font-family: 'helvetica', 'arial', sans-serif;
+  font-family: Helmet, Freesans, sans-serif;
   min-height:8em;
 }
 
@@ -402,7 +405,7 @@ p.label-valid {
 
 // Padding creates page margins on mobile
 .container{
-  padding: 0 1em;
+  padding: 0 1em 1em;
 }
 
 // Use full width to reverse .container margins
@@ -425,7 +428,7 @@ p.label-valid {
   width: 175px;
   height: 40px;
   top: 0.4em;
-  background: url('/cobrands/fixmystreet/images/sprite.png') -3px -3px no-repeat;
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAK8AAAAoCAYAAACIJ6oVAAAACW9GRnMAAAADAAAAAwB3k5ejAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAABmJLR0QA/wD/AP+gvaeTAAAag0lEQVR42u1cB1RWx7YeBBW7YAOViL0bNSomdsWADVsQbEHFiAUUMYmiokEUWzQiiQ0VNSC2gFiJmthbiF1jwxaNGr0pKra8t1be3r/frLc99/zwo7nv3rzFWWuv/z9zZs6ZM/PtPd/eM3OUyj1yj9wj98g9co/cI/fIPXKP3MPaYQfJY6Po/LlH7vFvBa09ST6SIiROJM7ZiBPy5kPZXBDnHv8W0OYHGCuSeJB4kniReFsRL+TxQBkngDhPbpPmHv8XRx4AjoFXiaQFSUDXrl2XxMfHp585c+b2nyZHZmbmM742b968gx4eHvO5DElzkgokhXKtcO7xrz7sAbQKAF7AoEGDEk+ePPnznzk8tm3bdhUg7kFSE5QiJ1bY7jXkrxyB/pX5/4o2yD0EcKuQdHdzc5t14MCBm3++5rFy5cqjdL9AKMMbJAWzAbB0DLlODlmIPeSvdBrNnFNr97LmyL4OsOQ97bNoA/nuf1eA/yX1zCOA69uxY8eEhw8f/mEGxrt37z5OS0vLWLZs2QmS4yzr168/d/Xq1V+sAfjKlSu/kjLMpHv7AMD5TCprJ7h2XvDtAqgXS2EhOq0g8jgiv5Z8ooNtbRj5fAfcI5+VexkBlhf5XvXZRsXVz3fEOxrbQL+7I/LlNVFio2Lb/YeBNqt62uXkRvlAFboDuP9lQgOudenSZRmsqI+Js+bj6en58erVq/cT/31uLH/p0qUHAHALUAj7LJzEQuDcpUlcScqRlBfC52VJypCUElEOluIkRdG5OYl4GJ9fVNyrENKlpcsD0DgiulIczy+G/DmNtkjFLYj7lCRxsfL+Lnh3JwC6gEGBHYVS531FZfpXWVppoMzqabOy2aMBmjNHNVrcCxcuPPL29l4D0LYkqQzQlICUhJSB5W5ZtWrV4KNHj14xs8C4T010cB4rIbkycBbrkLyF6EVTIU1IGpHUJ6lFUg31qowoR3nUqbCNIJLALQqleQP3egPnRXHdwQAyZ4CpEp5fAfmLCMDb2QjcfKgzg9Id79YQ7/82yTv49UC71EWblxdALo46lUT/FLeifLZSjFelIXZZjFTaQBQX+HFGGxdA22YLYDvciBs+4NSpUy85ZhcvXnxUtmzZhXTNTzhdjrh5ATxMx3eLocNKIK9fbGzsXiOAU1JSTsKJqyDogx1AUQgdX33RRDX84EqV8G2cWrdzkfpqx0KVzML/dy5WX1H6+n3LVdKsUPUR5W/DFn3BeBV8ap2KS5hmUZBK6NBC2TSGUXHY0tc4s0EtObFWLW3R0HLvGkgvIqhBQbwrP6dB0gwVfixJLY+brIYivwuAmF1H2IkITxGU4/LvvPnmm73IZ1hAo9axe/fu3dBtyP8vX76cnpSUFPPWW291pbyNAXStwNXQBzWggC7oH0dh3ewNw7Y138HeRPKYgNnOCl+3N3B3R9TFBW3H9ayNOruhTQvZAmBtdVtOnz59i9HiAri+JFVFRxhjv+1I2nIHwmLqYZTL+JoBGFGI5riPvei8orB0jffHq9V/nlR/2iLV3dUQKtNrz1K1ls/TE9UKWGU3aLcjGi6PlUbOJxWHFUHfmxUEI051XC8M4DrBOjauV035PU9XmSJ/M1jEElByBxM+Z2diccsAhG0GDx4c/vTp0yfZOcTPnj17PGnSpEjE2LmeLVJTU2fytT/++OPR2rVrxwIc5dAWBcVQbSb5BdfXfkdBIVnxbAcDHSggRPP34qhL7QEDBrz3+PHju1xXUsY0KGEVWOKCot2scl0GYYDkqcx5GzZsuAoWVwL3pTAaNfCqmJiY/dOmTdtepUqVkRjGCgsrymX9jBSCoxiIA1cUw1l+vJgltuzdTI0a5quWaBD17ahS+3dWyQFd1PoAH7V2YFeV9Mte9RtfG9lbxVKZYUsi1PKbX6sf1sxU8zDEVhVDfgHhTDkYnKLCAFpF0BJf/dzf96t/QIGbAqzOqCdb4noknbZ+rjbr/Fti1Rb4BA0wnBcXzzZyZiNVYOvTysvLa/QTOnIS1RkzZswcKtufhQGt02/dunUOxqUOlLm0GKpL4rlaSor3K442KQUr6WrCsx0NQC8oRuNSUMYy4t6l0CZcl3a7du3aIN/Bx8cnCLSokhjlTWlXHjyo6cyZM1PlTRYvXnxWcFMJXEsYjfNLsGdkZPzm7u4+AR1WWHQM/6/JjpzRiYP19YCV1p1YHABi5ehHMlGDgv4vImFQstMXTTLtYqq6xtdG+CkeIUJJRpAMIunJIEAjVUCjlxDOV0HhlDmjgSvAWncK7afmScv+ebj6ktOhnOVxvyp6AufXfS+UiOXgCnUcINLWuhyeXUTwOQfh7GmOXVkrzqFDh743gvO77777nQzFtfnz51/ZvXv3P8Xdjx07dpHKch9EyHTqmwy0ZRu8n6YTtdA+daGEdZFWHe9WFXnrgXc3wm8dXC8HQBaDOKNdKkAJ6+J59fFfP/dNKFP/DRs27JJ1DQkJ+ZzxBT5fDm2W18z62kMTOh0+fPiatLrly5efi8Z3FhaKh/NuNCQdN/Dih+XKlfuCrnVFHkcxdORHx7XcsmXLd7Icz8RhKtlJOEBFAI5GAOAYAd5Z3DEkYSRs5UcBsKMgnBZM8gFGjHehHPXQcFVQP1eA1RXnVdBpDdDB/Yf0VMv5mZmH1XP+ZQtP6e8DrDVQhvN3mT/2Bb3ReS9sVDcofTjA7mHo7BIiMqCpRzncsyksdsiNGzfuybaaM2fObUrn9tpFso1kO1naMzIP9eF1Sud+WCTTf/jhBx7lPibpizq9O3r06BHdu3dn49SN/Y8uXboMjYyMjECaN/qlPeevXbt2/wkTJkSNHz9+6sSJE6d07dr1A1xvjHatiBGpGoDavH79+j2nTJkykekMCyxqJ1CbzlDu8BUrVqTLugYEBKxD27VHm5REW9mbOWqs7YPkDQhk12F1KyNPHoCqyZAhQ5YbeHEm8eI4QS+KoHNc8ELa4lRh6yvL8lQyGspZEPoCsEK1AL4PBHiZuzG37Q1g98RzuSEGX9umLl3dqi6nr1aH331bjYFT6H1vtzpJVOJAYrTFKjUBmGvDAniwk8V5yNFLpvP3GDxMS/iZqTHq1t1v1GP+/8lQtRwK2hSWgYH+/i+wultj1XX+/SFFMVj4+X1C+6pgvvf5FLUWHasjNU5oG1aeeuMDVeC5ZPXt9e2KrecUo1Ul0Nyi9H0kTEk2QFK++OKLi3rka9u27ba4uLhT1mjF7du3f2Jg7N279xudRqBMSEtLO2Ri/UIqVqw4jhTie7N7Xbt27RJhYSzA2Bwc35OBfvz48QNWYv0Z/v7+bIBC33777bnEdZ+Z5SO29DQiIiISylFeWN+XwMuJHrxmwVD5HdCSUoKjcWN7Hjly5KoB6GxlhsG6FMMQyB3Uvm7dur0BwqLoMJ+ff/75kVwLIcCrCb/kvdwofQV4QxgQJB0x7LSBBejC6XKY3xRjsU4DjenEoT/Eu/FzO++Gg8fCXBlKGx7zsdrPafR7Lay/Osv/iaKwUg+G5eBO8x3ZR8XytZ+/VY/oPJn/39+jHtD/8axo4YFqmr7/jkUW2uMhvGp3KJDn5c0qXbxnjNl0/DfffHM/Ojr6LLXrJsqTSLKahEOYrBjsJGY7jc90S57L/tDH8uXLvyfOvd4auCTIevfuPR2+S0CbNm0mZOdg8j3p3mup3Las8q2hg+7ZGlgqjpH/Jb5rAWTfvn1TDaQ5DtalqAAVA8ybAWcSt+0HE18WYPWdPXt2CvG2Y2JCgs1/B+OiHhPwaurgho7uJTo1FEO3D0DbCuIFCxw8O+wFgDZ8qr4BleCw1fBdi9VeTv9tv/oFvHhonw7UkZT29Kh60ruDmg6rzkNWRPwU9T3Ay4DdTdY3E+BfAgBzPYZf2vSCc48frA7R+TpR14mgMcNH9VHzOe3BQXUfitZU8MG27Jjy9SdH1dNypVUMpS0MDw8/klXn3r17N5PXjgwdOnQv5Wc+vpLF19f3W+K+L810Mg08ceLEPZ4JpTyLs7rvo0eP/qhVq9aeS5cuPZTp5PQ9Jyucyb8y/dy5czwicNtFG6kO5X1Gxu4R0ZYnxsmqUqVK7SJl/IfxfkxB2UBWqlTpI1CHqsBpfiN4LYAkLdhqANRwkHZHEX8tExwcHGpFm9nK9AJ/GkpcZ6fgWu2FV+vNDZgFePWzCoMHNpZeP1mnK0wN2ELe3qXOkLU7xUMy7sHgHTm4u1rFedfMVNypH4EDM4gnEhe1DOuJ09UBOp9B97nL53GTLVZ6NMDLYJ+wYor6jq9FjVAXmGdGh6gzfL47TrEjO4mt8wc91ApOozo8BHhWCfBGCD4+lhy6Xzn9owEW3t4FSsejhy+PEnxtzzJ1hs4/ZctLsiwxMTHDligDWc9MomSpXAZA3iyvp6en/waawbQn3lj+/Pnzj4lrniOjdYKu7xk1atRlQ2TomZOTE1M8ph03k5KSXrLWrVu33kUU4qBMO3v2LJfhUZkxcHP16tUvlSHacJrSj82aNeu+TO/Wrdt3lB6LfmiTleW1Bbw6YlCLONV4s8a7fPny79u3b88g/nRw+vTppw2TEZ5iFs57xIgRu3II3l7ZxXhxDw5lhQQCvEkzLPyQKUIQGiK8UW21+PER9Yyvpy1Qly38NNnSuJPxzv0wBH6Ynqgy+HqPdhagby7trLZoh6xBDZVAaZ+TNb/A58sjFY8wbJEXE2e9z2lvuKhpAC5TnbEzQ9VGTj+9wQLQQeDWrPBBGtidW6p4Op9KEgUQx/fo0eMQ04XsAMyRnPbt26dwGZL1higEh/o47LmAJM5YFqBlLr2RncHk5OS78vrmzZufR0VFPWGZOnXqk4SEhKfyOjlkNzZs2HDfUOYZ5X3M+Vm+/PLLpyYO6AkC70vWumfPnvvZsMCPaYoR+J84r1Xa4OHhEYuCxcRkgx87ZmZrHqwd48aNW4uhX8/RdyAivs8G8BYCBWkkLS/9j4Q11U6bDyy7J8Irwwf3UCuF5R2l4574P2POGHVU34/B2LCmZTIjHKDtBiUI5ogB5+n1rtoJbpm0eOIL7rv1c3WtbhW1Rd/DtaQFMBz2m8fOGqcHvWexgiOhOKPdXNT0J0fUU77WvIFlmGXqEhwx5IWy/UijADtqJOPwjmy5OeLD9UvhYXbAgAFn4uPjf6LDlIsePHjwBqxvgkwnHnwPwGWFiDUZOdkqL0UoMsFIO7I7ZsyY8Ss9O0cxaQIvW/H0Tz/99I5M79Wr1y5Qru5wrMsgKmNvk8M2cuTINPDI8rDAvjzTxjNutlbu9OnTd8ELK+LhFodt3bp1P2ThsJmBt6ch2sBg8IfT1RoTEc1wPuSDnjQsUt61s9QeWNNeiEow4KM8PdQmfT/msRiixiCfFxTiA81l+3VSKTr85FJCJT06pJ6T/EFD/U1QjpMY5hmQM86nqB85fUhPC6BDYGXZoR2/ef4Lpwy0hYE65ViSushp00daLN8ETTWaNWs2kxc4YaIoHg7aWljHHdWrVz9u5JIAIoN3hUw7deoU98VnHBdnhTApswD14RFoHoM9J0D8+OOPf2NqkZMykydPvkrP2j937txbMt3f3387RswOwF4JEfHKPlTGAINlY1D4M3B5jYOtFeOlke7u7hGYKXECeDnOGZiRkfG7lVCZGXg5IN5NgDcIw20bALsO4oz1YX0H6fgswDsM+bshijDl6lb1C19/SADk35VR6qgBvMxHA/VQjg7/BMP5fLrveWm5yeouxzUG3ifMW/nauEGWKEAwrD5b9dAmddQXfI2pCysD0w9xPgWdFtKiRYso2Z59+vTZzJQEws9bzzy8Y8eOF02A+E+8FuCdBwX7zKTMVCgajwafkOF5yRrSkK8pQCZ+Lf+jo6MfBgUFsRN6hSzvU0OZ56JM5rRp0zj/A+a4zKlpJGGHOi0mJua6LMdRCPSHF6IyzmbgtTpJwR4nhugxrq6uy2y1uBwGWbNmzV6yCkMBXBfEbS2TFLycMotJCiN4XTEJ4CPA2xtOTj1YdL1MsBomVAJouF4qwDsCjhxTgSCmEnzt+Br1j5qV1F62onze09NiOd8XtCFIPPMjPcTzcEY0I15f+2qOhb9OR2NbuO3qGS9CbKAtwXj+e1CeieeS1S2+Hh6ojiyJeAH01HmWGTkdnQg2zjoxn61fv34SLORCOGXbiGteN+aD5V1mQhsWA8ALTcA7DgrGijaGOO9LsWIC3iM4axxZuEWO2E9jx479NTw8nO/LjteJuLi4+4YyPKrdRpmbVOZHzk+08UcGLRRwQ2xsbIbB8qahPp0RuSopfC/bpod59oa0Ywd5opnWwMr8t1+/filhYWFzQkJCRoF/yo2XeoEOW8dAXg+cxfSwnQl4LVO1AkjdkF+vFtNz7+5Qlr5Dfckh+V/wcARhAIufl5oFa/msThW1lWOys0LVMU67tUPdAfgGIgw2WjxT0xRfXP+IhvjNidHqYNN6lqF4JIDPMlIriADve6A0DOLRYf1VKl/fu0zdvoPJD3YkoQD87KE8cWDmkPEGgKVLl57kqXuz6WFymq+Cty42hr849IaIRKIJeEdj5OFJnaCBAwcmGfOQI/5b48aNf/Lz87vLkQSdHhkZeZnK7CSak25WpnLlyjepzB1ZhrB2AkoWv3DhwvPGrWODBw9eWbNmzYGYCHIFHhyyXJjDIRd9kwcPHvy3fKAZcDt06JCITqklZo2KiEXFhbWzxyDPYmGO2bJIF1hYbwGkjrDG5eAE6kUgOjLhN9xPLcJs11FwZLaaI27vVD9x+vyxlijEIkQHFmlLuG62+panUJvVVzPIKiZx2u1dFqsRAP7VGjN+vrCiQbjWA9d55m3wp2HqK1j3C6P6Wix6Tyh1Z0xbR/OEhn6nQ6ssceRIMaXNEY8xHGbMCYdkgMI68+Kcz+7du2c6WrZq1Wq3CXiHgy55QVF5Zu26Lc/FGhgOE65OSEi4aksZcjq/Rz1jrM0IkqJuxCSVO/o4b46WRNoAXLlU0sGwLE4D1+LsGaMU7CQalkQqAd6CmCLmKdx2ArztkFZGLK4uhHOeqeqqJwREmbCNn6k0/n8pVV0Dt5wEbz6SeaiOAnRppZbqYZ+Fp5phkVpAkd6E5W+NurTCeSP89wv2f8FrxfN7gKO3BzAj5n6oDuvroX0tjloYLHR7WGm2Op8QfThrS3/cuXPncfv27ZOxWIlj7pM2btx43Cxvy5Yt93F+fX7z5s07GJ084fwygAe5ubnNJh77Y3a+TaNGjZYitMfPXrB169ZrWZUhpXrYpEmTzxHhmUQOabzZrhu6z2a0sekkhU2L0c2A6+XltQ4aWh2W1sGwQt5ZL0Y3c/asLEaXi8IdQQe44m8f+VKtYgE1qCrWyOYTnLo6+PD7q6aq5OS5ageDlukATwIQr9zu722ZIBgq+B0P06ETBqsEGub3MB0Y1E0lcoyYZ+j6d7YAvROsvd6dUQHOZzWxa6MygM0dP2DlVJWS8pn6evsXKhUWWYPdYtW83nkxJY3JjSkAT1sMk01gyblukQ0aNEhYsmTJaZ4h41k1uYpv//79t4hiHECYbiIc1AGIrIyLior6+tChQze4T3mkGzZsGFOZhHbt2m2h9Ovp6emXaUifjb7wELtWvDESRJGzuIWfw7F8rSh8v8mTJ+/mDbqgTYNQX6Y+M8jp2sIgNpYhH+cAlZmB0VDXM5wNIQcJOA878VT2KO/EQZtkCd5stwFJKsGai0o2Ewu9C8O0l0JHsvMUyFuHbt++/dTGbUByR0F+0AI3TKN6QOoirZjYjqMXsLshOuENkASAh/bDaqo+GCk6wRK2BA14D40fgvf6EJZwCIb8ZmJNcHE828mwZ64UQNwI1KYPnu2H83aoF9dlPCnVCQZv7DiLUxkm1v7qXRD1Ubf3cT0SK+rmCJmNSMh4gMEfz2gL8PfGO0UgX7SYAIkUDqI/Ro2aYtuTfP4YKNhsPHcWyoehjTujPdviPQaiDbMq0wWWXrfVSNQzCr8jhEJVQJvne60NmGvWrHmAEEckXlqvKHoLvwyMQBoWFhidMxs3YCpBOwrC03wD4KmK/3qFfV6xraQA7ueul+QBMJ5il0crWO76WIdRFZZGfwXIB0D2FTz2HXSq3v5j3KGcXyxkL4nRqyEsrTc6pyM6mOnHcDcXNVPP8vF/dHZLWHO9SLw8/Agdv9bKOAiKHwjL1QdOrCcsdm28W13UXc889jUosb9Q5OZil4Xek2jt+QOFUuqy9TAKVcPo0wLva61MC7HvsB7q2QH16YN8nZFeQ1BEh9fe+s7Wd9OmTTd5Kphn5tgzDQoKWsa/c+fOPbxv376fXmPru3E/WSGAsjTE2bArVy7mkRshK4NG1IBUB1h1eK0UOkkvQK8uFly/BStYB2B0Mdl4adzbpeuqlzjWBpjadG+rAu/vUdenBatFHMb7MU39LNYxhGEmqQHi2kXFAvnSOdiAWRWAKy12PbiLGHgjOLSN8V+/Y23xjsXENh+z5zcRG18bIr2iWORfAv8r2lCmrNgVbqxnQyttb/93+uiIvdhpIPdO5TX5foJxC7qTYVdzCbG1pbDYU6WBUkI0ptlWl+x23UoFchKWq/mCCS9WrklhAL/hahkiB8BKVzVsbM33Clvfi4hvWBRC2RJi0X1Zw/uVMXnHvIKKGZ9fVnxuwEXsoCgk9r4VsqFMcbEH0KyeLugLY9vbvA3+3/25JzvDxzekmH2Uwvjxj/xWNhbmEx1kb9jDVkA0aEHxDQRbvndgBLDeC8cWx4ccv8iv5qidHPudGWpx4sLh4HTEUOtq2GWc04+O5M/Be0kpYPKthOyeb/zYiYNhZ7AtZfKa7CEskEW9cvStif+UD+3l5NNFdla+wmKfxRdZrH1S6VW+NGPcvu6K4a8N+O4QTFoMA//sgOG7AqxRfisjyqt+7slaG2TXJsqG59v6XFvK2NJXr/Rlk7/rJ07tXhH4r/uNLxnqc9JbfOCQdRA7MHTcuAJGI7013i6Hdcuujn/FRwn/6ue+rpF6pQ7J/bi07dZXR0D05soqcI7qiA2LLmJLvIP6z/uW2P+7jsn9rL/tAJYOpLP4LoLx80u5wLXx+B+cTUKEm3GYQAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMBx1tHgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDBtKAzEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAABJRU5ErkJggg==') no-repeat;
   text-indent: -999999px;
   position: absolute;
   z-index:2;
@@ -433,11 +436,15 @@ p.label-valid {
 .ie6 #site-logo {
   background: url('/cobrands/fixmystreet/images/ie_logo.gif') 0 -5px no-repeat;
 }
+.ie7 #site-logo {
+  background: url('/cobrands/fixmystreet/images/sprite.png') -3px -3px no-repeat;
+}
+
 // this is a skip to nav for mobile users only
 #nav-link {
   width: 50px;
   height: 48px;
-  background: url('/cobrands/fixmystreet/images/sprite.png') -5px -916px no-repeat;
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAwCAMAAABkKdmIAAAACW9GRnMAAAAFAAADlACdjNY6AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAABEVBMVEUAAAAiIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsJAAAAABPQAAAAAAlHgBnVAAAAACSdwAAAAAAAAAaFQAAAAAAAAAAAAAAAACRdgCqigAAAAAAAABHOgDCnwAAAACriwCAaAApIQDOqABIOwCgggBqVwB8ZQDVrgCwkADjuQCafgDftgDetQCqigDrwADHogDGoQDFoAD1yADzxgDyxQDwxAD/0AD///+ZbHkYAAAAWXRSTlMAAAECAwQFBgkLDA0OEBESExQVFxgeHyEkJSkqMTI2Oj0/Q0RHSEpOT1FSVVtmZmxsdX6Kj5ebnp+goaenqKmru7y9vsTY3uPk5OTl5+zs7e7x9PX3+Pr7/fI8qpUAAAABYktHRFoDu6WiAAABMklEQVRIx+3T2VLCMBSA4ZjU1hhpUKgWlaq0VSuutYg7IJuIogKKvv+LSM2AelNOuHCGGf77b7KcBKGwT2AzYej/CIYSPCBEhRKVCILVBJQkVCwIS0NJmglCYhkoycSIINyBEocPiAsl7ljkeypTMhHko9tpD+t0QavUSjcX+bDzy9vSPYj0zg523LDtvaNCD3aWh11ziXMeT64fP0OPX1xbmCVEXdyqwm/sNEWJMr96LXHJb4fLczR1IjWXx83kyv6r3CiLG05VdvpXd9IP5n36XyaStGCiNSS6XYaRsq0LgpnlNyGi6VsMC6IZXlAfLeqBZ2iCIELNbFBpvLQjempUgqxJxb76KdT0/Fw+spzvmVRB6McYlu24ETm2ZfwW/b1pTOeR6Uwj6E8YkxFhjMbuC8zPYpEN6mT7AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwHHW0eAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMG0oDMQAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAAElFTkSuQmCC') no-repeat;
   display: block;
   text-indent: -999999px;
   position: absolute;
@@ -466,6 +473,9 @@ p.label-valid {
         color:#fff;
         text-decoration: none;
       }
+      span {
+        background-color: #ccc;
+      }
     }
     &#mysoc-menu{
       li {
@@ -473,9 +483,8 @@ p.label-valid {
           color: $primary_text;
           background: $primary;
           &#mysoc-logo {
-            background-image:url('/cobrands/fixmystreet/images/sprite.png');
+            background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIkAAAAyCAMAAABf9whNAAAACW9GRnMAAADwAAAAJgAMZizzAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAANlBMVEUAAAAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiL///90WH2CAAAAEHRSTlMADx8vP09fb3+Pn6+/z9/v+t8hjgAAAAFiS0dEEeK1PboAAAGqSURBVFjD7ZbNjtwgEAY/oIE2YKj3f9ocPDOZ3eN6FCUKdWsJQ+H+saXNZrPZbDabzf/GovwdIhH8LUzHn/PqI32Jcw1v0fjidQf30EZPqmMURXeT5F5kbYwqSQbeWpAU6xg961pT+mgm+WR4Ke6SzG9JwQRWB6iaTClCzQBLknT0AibZAnCBSx2ALACGQ5JOznsmq1TA82LKIalC6Jwh5seaMGdUWKxiJQpclWVqLNlJsxThUIB6z8Qft3FQgEODrs4qUuj9qoljpAr2euKkmxVIjzrpTBUI90xMGgzJQGrMAEUGrGKQn6c7/HbngT1MMqRO1wdNDA6WpNgW5Ld38s1kuLt7fPbO5Lg7Z76ZaLJoV3WAa6wsxbmiyrMMruyMVxc3SaqvAv+YSQWS1Fs9oAi8jQKmsGB4zwJXgdO9VWnAkaUAHJ81CTAkLYAm5ZbB/QhSmm9d7Ff7Splr5jaI90zMgpQsScHsGmRFUsheH6O1jecR5m5BZlFSzF5NkpJ7lMJ85etDlPWjHdMJ6aMiFdYPdgzw6Q90Yvwo2+fM+3dps9lsNpvNP8gvi7UYry9B6TcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDAcdbR4AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwbSgMxAAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAASUVORK5CYII=');
             background-repeat:no-repeat;
-            background-position:-240px -38px;
             text-indent:-999999px;
           }
         }
@@ -486,6 +495,10 @@ p.label-valid {
 .ie6 #main-nav ul#mysoc-menu li a#mysoc-logo {
   background: url('/cobrands/fixmystreet/images/ie_mysoc_logo.gif') center no-repeat;
 }
+.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo {
+  background: url('/cobrands/fixmystreet/images/sprite.png') -240px -38px no-repeat;
+}
+
 //defines where the table caption is (login stuff on mob, nav menu on desktop)
 .wrapper {
   width:100%;
@@ -543,7 +556,7 @@ p.label-valid {
         text-transform:uppercase;
         font: {
           size:0.6875em;
-          family: 'helvetica', 'arial', sans-serif;
+          family: Helmet, Freesans, sans-serif;
         }
         &:hover, &.hover {
           text-decoration:none;
@@ -1389,7 +1402,7 @@ table.nicetable {
   h2 {
     font: {
       style:italic;
-      family: 'helvetica', 'arial', sans-serif;
+      family: Helmet, Freesans, sans-serif;
       size:1.1875em;
     }
     color:#4d4d4d;
@@ -1402,7 +1415,7 @@ table.nicetable {
     padding:1em;
     color: $primary_text;
     background: $primary;
-    font-family: 'helvetica', 'arial', sans-serif;
+    font-family: Helmet, Freesans, sans-serif;
     label {
       margin:0;
     }
@@ -1444,7 +1457,7 @@ table.nicetable {
     color:#C8C8C8;
     padding:0.5em;
     font: {
-      family: 'helvetica', 'arial', sans-serif;
+      family: Helmet, Freesans, sans-serif;
       size:0.8125em;
     }
     @include border-radius(0 0 0.25em 0.25em);
@@ -1461,7 +1474,7 @@ table.nicetable {
     width:100%;
     color: $primary_text;
     background: $primary;
-    font-family: 'helvetica', 'arial', sans-serif;
+    font-family: Helmet, Freesans, sans-serif;
     div {
       display:table-cell;
       text-align:center;
diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss
index 207c6a4c4..8f56a53fb 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/fixmystreet/_layout.scss
@@ -177,7 +177,7 @@ h1 {
           &#mysoc-logo {
             width:84px;
             height:16px;
-            background-position:-260px -43px;
+            background-position: -20px -5px;
             opacity: 0.8;
             &:hover {
               opacity: 1;
@@ -191,9 +191,9 @@ h1 {
     }
   }
 }
-
-
-
+.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo {
+    background-position: -260px -43px;
+}
 
 // .content Is the white box
 
@@ -792,7 +792,7 @@ body.frontpage {
     top:3em;
     width: 300px;
     height: 60px;
-    background-position:-2px -108px;
+    background: url('/cobrands/fixmystreet/images/sprite.png') -2px -108px no-repeat;
   }
   #user-meta {
     z-index:10;
diff --git a/web/cobrands/fixmystreet/_mixins.scss b/web/cobrands/fixmystreet/_mixins.scss
index f77152dd6..4c7bc5af8 100644
--- a/web/cobrands/fixmystreet/_mixins.scss
+++ b/web/cobrands/fixmystreet/_mixins.scss
@@ -3,7 +3,7 @@
   cursor:pointer;
   font:{
     size: 0.875em;
-    family: 'Helvetica', 'Arial', sans-serif;
+    family: Helmet, Freesans, sans-serif;
     weight:bold;
   }
   text-transform:uppercase;
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 55b006b42..21cc16cb4 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -8,70 +8,5 @@
 @import "_colours";
 @import "_mixins";
 @import "compass";
-
-/* HEADINGS and TYPOGRAPHY */
-
-@font-face {
-  font-family: 'MuseoSans';
-  src: url('fonts/MuseoSans_300-webfont.eot');
-  src: url('fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'),
-       url('fonts/MuseoSans_300-webfont.woff') format('woff'),
-       url('fonts/MuseoSans_300-webfont.ttf') format('truetype'),
-       url('fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'MuseoSans';
-  src: url('fonts/MuseoSans_300_Italic-webfont.eot');
-  src: url('fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'),
-       url('fonts/MuseoSans_300_Italic-webfont.woff') format('woff'),
-       url('fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'),
-       url('fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg');
-  font-weight: normal;
-  font-style: italic;
-}
-
-@font-face {
-  font-family: 'MuseoSans';
-  src: url('fonts/MuseoSans_500-webfont.eot');
-  src: url('fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'),
-       url('fonts/MuseoSans_500-webfont.woff') format('woff'),
-       url('fonts/MuseoSans_500-webfont.ttf') format('truetype'),
-       url('fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg');
-  font-weight: bold;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'MuseoSans';
-  src: url('fonts/MuseoSans_500_Italic-webfont.eot');
-  src: url('fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'),
-       url('fonts/MuseoSans_500_Italic-webfont.woff') format('woff'),
-       url('fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'),
-       url('fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg');
-  font-weight: bold;
-  font-style: italic;
-}
-
-@font-face {
-  font-family: 'Museo300-display';
-  src: url('fonts/Museo300-Regular-webfont.eot');
-  src: url('fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'),
-       url('fonts/Museo300-Regular-webfont.woff') format('woff'),
-       url('fonts/Museo300-Regular-webfont.ttf') format('truetype'),
-       url('fonts/Museo300-Regular-webfont.svg#Museo300') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-
-
-/* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the
- * table caption *at all* if the header is set to a font-face :( */
-noindex:-o-prefocus, #site-header {
-  font-family: sans-serif;
-}
-
 @import "_base";
 
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index b674020b1..f43fba6e1 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -377,6 +377,7 @@ $.fn.drawer = function(id, ajax) {
     $('.container').on('click', '#alert_email_button', function(e){
         e.preventDefault();
         var form = $('<form/>').attr({ method:'post', action:"/alert/subscribe" });
+        form.append($('<input name="alert" value="Subscribe me to an email alert" type="hidden" />'));
         $('#alerts input[type=text], #alerts input[type=hidden], #alerts input[type=radio]:checked').each(function() {
             var $v = $(this);
             $('<input/>').attr({ name:$v.attr('name'), value:$v.val(), type:'hidden' }).appendTo(form);
@@ -434,9 +435,11 @@ $.fn.drawer = function(id, ajax) {
     /*
      * Fancybox fullscreen images
      */
-    $('a[rel=fancy]').fancybox({
-        'overlayColor': '#000000'
-    });
+    if (typeof $.fancybox == 'function') {
+        $('a[rel=fancy]').fancybox({
+            'overlayColor': '#000000'
+        });
+    }
 
     /*
      * heightfix the desktop .content div
diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png
index cfa2ba098..61c27b32a 100644
--- a/web/cobrands/fixmystreet/images/sprite.png
+++ b/web/cobrands/fixmystreet/images/sprite.png
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index f9d5b3930..ff7080c11 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -1,3 +1,68 @@
+@font-face {
+  font-family: 'MuseoSans';
+  src: url('fonts/MuseoSans_300-webfont.eot');
+  src: url('fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'),
+       url('fonts/MuseoSans_300-webfont.woff') format('woff'),
+       url('fonts/MuseoSans_300-webfont.ttf') format('truetype'),
+       url('fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'MuseoSans';
+  src: url('fonts/MuseoSans_300_Italic-webfont.eot');
+  src: url('fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'),
+       url('fonts/MuseoSans_300_Italic-webfont.woff') format('woff'),
+       url('fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'),
+       url('fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg');
+  font-weight: normal;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'MuseoSans';
+  src: url('fonts/MuseoSans_500-webfont.eot');
+  src: url('fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'),
+       url('fonts/MuseoSans_500-webfont.woff') format('woff'),
+       url('fonts/MuseoSans_500-webfont.ttf') format('truetype'),
+       url('fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg');
+  font-weight: bold;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'MuseoSans';
+  src: url('fonts/MuseoSans_500_Italic-webfont.eot');
+  src: url('fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'),
+       url('fonts/MuseoSans_500_Italic-webfont.woff') format('woff'),
+       url('fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'),
+       url('fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg');
+  font-weight: bold;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'Museo300-display';
+  src: url('fonts/Museo300-Regular-webfont.eot');
+  src: url('fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'),
+       url('fonts/Museo300-Regular-webfont.woff') format('woff'),
+       url('fonts/Museo300-Regular-webfont.ttf') format('truetype'),
+       url('fonts/Museo300-Regular-webfont.svg#Museo300') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the
+ * table caption *at all* if the header is set to a font-face :( */
+noindex:-o-prefocus, #site-header {
+  font-family: sans-serif;
+}
+
+h3, h4 {
+    font-weight: bold;
+}
+
 @import "_colours";
 @import "_layout";
 
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 054a67767..8dc6403cb 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -149,10 +149,10 @@ function fixmystreet_onload() {
     var markers = fms_markers_list( fixmystreet.pins, true );
     fixmystreet.markers.addFeatures( markers );
     if (fixmystreet.page == 'around' || fixmystreet.page == 'reports' || fixmystreet.page == 'my') {
-        var select = new OpenLayers.Control.SelectFeature( fixmystreet.markers );
+        fixmystreet.select_feature = new OpenLayers.Control.SelectFeature( fixmystreet.markers );
         var selectedFeature;
         function onPopupClose(evt) {
-            select.unselect(selectedFeature);
+            fixmystreet.select_feature.unselect(selectedFeature);
             OpenLayers.Event.stop(evt);
         }
         fixmystreet.markers.events.register( 'featureunselected', fixmystreet.markers, function(evt) {
@@ -173,8 +173,8 @@ function fixmystreet_onload() {
             feature.popup = popup;
             fixmystreet.map.addPopup(popup);
         });
-        fixmystreet.map.addControl( select );
-        select.activate();
+        fixmystreet.map.addControl( fixmystreet.select_feature );
+        fixmystreet.select_feature.activate();
     } else if (fixmystreet.page == 'new') {
         fixmystreet_activate_drag();
     }
@@ -202,9 +202,11 @@ function fixmystreet_onload() {
         for (var i=0; i<showhide.length; i+=2) {
             if (this.innerHTML == showhide[i]) {
                 fixmystreet.markers.setVisibility(true);
+                fixmystreet.select_feature.activate();
                 this.innerHTML = showhide[i+1];
             } else if (this.innerHTML == showhide[i+1]) {
                 fixmystreet.markers.setVisibility(false);
+                fixmystreet.select_feature.deactivate();
                 this.innerHTML = showhide[i];
             }
         }
author	Matthew Somerville <matthew@mysociety.org>	2012-05-16 14:30:30 +0100
committer	Matthew Somerville <matthew@mysociety.org>	2012-05-16 14:30:30 +0100
commit	d9f3bd47a94116871893f0417e7c836400bb04eb (patch)
tree	1c140a6cb9ea3fd60dbf1532d2cb0bcfdaa703ad
parent	1ba0a33c9fa19f2fa46f16678785d1c90ed33eb0 (diff)
parent	194173589eed229567646cedfc0e32621d18f1e7 (diff)