Merge branch 'master' into bromley

Conflicts:
	bin/send-reports
	perllib/FixMyStreet/App/Controller/Report/New.pm

5 files changed, 0 insertions, 8 deletions

diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss
index 4a5502351..3b65f941c 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/fixmystreet/_layout.scss
@@ -404,10 +404,6 @@ body.twothirdswidthpage {
         &.m-app-iphone {
           background-position: -12px -3610px;
         }
-        &.m-app-iphone-streetreport {
-          background-position: -12px -3678px;
-          height:50px;
-        }
         &.m-app-droid {
           background-position: -12px -3756px;
         }
@@ -427,10 +423,6 @@ body.twothirdswidthpage {
 }
 .ie6 #footer-mobileapps ul li a {
   background:url(/cobrands/fixmystreet/images/ie_mobileapps.gif) -1px -1px no-repeat;
-  &.m-app-iphone-streetreport {
-    background-position: -1px -69px;
-    height:50px;
-  }
   &.m-app-droid {
     background-position: -1px -148px;
   }
diff --git a/web/i/pin-green.png b/web/i/pin-green.png
index 8b64d5160..47a0a6cc1 100644
--- a/web/i/pin-green.png
+++ b/web/i/pin-green.png
diff --git a/web/i/pin-red.png b/web/i/pin-red.png
index 9b754e42e..298f4d3f6 100644
--- a/web/i/pin-red.png
+++ b/web/i/pin-red.png
diff --git a/web/i/pin-yellow-big.png b/web/i/pin-yellow-big.png
index 59ed29dbd..d1642d644 100644
--- a/web/i/pin-yellow-big.png
+++ b/web/i/pin-yellow-big.png
diff --git a/web/i/pin-yellow.png b/web/i/pin-yellow.png
index f9359b0b3..196cb0f5f 100644
--- a/web/i/pin-yellow.png
+++ b/web/i/pin-yellow.png