update Android to Cordova 3.6

Required due to security issue

Remove Android directory as no longer required, move src -> www to match
standard layout, update .gitignore to avoid including the standard
platform files, update README based on Steve's zurich one

196 files changed, 114 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 2eb15ac..289374c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,9 @@ tags
 
 src/js/config.js
 Android/bin/
+platforms
+plugins
+hooks
 iPhone/FixMyStreet.xcodeproj/project.xcworkspace/xcuserdata
 iPhone/FixMyStreet.xcodeproj/xcuserdata
 iPhone/CordovaLib/CordovaLib.xcodeproj/project.xcworkspace/xcuserdata
diff --git a/README.md b/README.md
index e5ee416..d5b7679 100644
--- a/README.md
+++ b/README.md
@@ -21,17 +21,57 @@ To get it up and running you will need to create a config.js file in src/js/ bas
 on the src/js/config-example.js file. This has configuration for which FMS instance
 to use etc.
 
-You should then be able to build and run it like any other PhoneGap project.
+Setup
+-----
+This project uses Apache Cordova to produce Android and iOS apps. There is
+some mildly complicated configuration and setup required to be able to develop
+with it. The following all assumes you're working on a Mac.
 
-The platform specific cordova.js files are inside the projects and then the src directory
-is included inside the www folders for each platform. On Android this is done with a 
-symbolic link, on iOS by a build script.
+1. Make sure you have the latest versions of XCode, the Android SDK, node and
+npm installed. It's a very good idea to have installed the Intel HAXM versions
+of the Android emulator because they're about 100 times faster to run. You need
+to download it from the Android SDK Manager (run `android` on the command line)
+and then actually run the `.dmg` that this creates in your sdk folder.
+
+2. Install the cordova CLI with npm: `npm install -g cordova`
+Note that this is not the same as the phonegap CLI and the two should not be
+mixed up. The latter gives you access to Adobe's proprietary phonegap build
+service, which we **don't** use!
+
+3. Checkout the project
+
+4. `cd` into the project directory and install the Cordova platforms you need:
+`cordova platform add android` and `cordova platform add ios`
+
+5. Add the cordova plugins we use. As of writing the list is: (from `cordova plugin list`)
+
+   ```
+   org.apache.cordova.camera 0.3.2 "Camera"
+   org.apache.cordova.device 0.2.12 "Device"
+   org.apache.cordova.file 1.3.1 "File"
+   org.apache.cordova.file-transfer 0.4.6 "File Transfer"
+   org.apache.cordova.geolocation 0.3.10 "Geolocation"
+   org.apache.cordova.network-information 0.2.12 "Network Information"
+   org.apache.cordova.splashscreen 0.3.3 "Splashscreen"
+   ```
+
+   So to install them: `cordova plugin install org.apache.cordova.camera org.apache.cordova.device org.apache.cordova.file org.apache.cordova.file-transfer org.apache.cordova.geolocation org.apache.cordova.network-information org.apache.cordova.splashscreen`
+
+6. Copy `www/js/config.js-example to www/js/config.js` and edit if needed
+
+7. To run the project on one of the platforms, use: `cordova emulate ios` or `cordova emulate android`
+(You might need to `npm install -g ios-sim` to run it on ios)
+
+You should then be able to build and run it like any other Cordova project.
+
+- The `platforms`, `plugins` and `hooks` folders are auto-generated by Cordova
+no need to check them in (hence why they're .gitignored), you should only need
+to check in the `www` folder and `config.xml`, plus possibly `/merges` if you
+ever use that functionality.
 
 Basic structure
 ---------------
-* Android - android project
-* iPhone - iOS version
-* src - JS, HTML, CSS and image files
+* www - JS, HTML, CSS and image files
 * templates - templates with strings to be translated
 * locale - gettext translation files
 * bin - helper scripts for translation
diff --git a/config.xml b/config.xml
new file mode 100644
index 0000000..8d78889
--- /dev/null
+++ b/config.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='utf-8'?>
+<widget id="org.mysociety.FixMyStreet" android-versionCode="40" version="2.0.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <name>FixMyStreet</name>
+    <description>
+        Report problems on FixMyStreet
+    </description>
+
+    <author href="http://mysociety.org" email="team@mysociety.org">
+        mySociety
+    </author>
+    <content src="index.html" />
+
+    <access origin=".*.tile.openstreetmap.org"/>
+    <access origin="tilma.mysociety.org"/>
+    <access origin="a.tilma.mysociety.org"/>
+    <access origin="b.tilma.mysociety.org"/>
+    <access origin="c.tilma.mysociety.org"/>
+    <access origin="dev.virtualearth.net"/>
+    <access origin="ecn.t0.tiles.virtualearth.net"/>
+    <access origin="ecn.t1.tiles.virtualearth.net"/>
+    <access origin="ecn.t2.tiles.virtualearth.net"/>
+    <access origin="ecn.t3.tiles.virtualearth.net"/>
+    <access origin="mapit.mysociety.org"/>
+    <access origin="www.fixmystreet.com"/>
+
+    <preference name="android-minSdkVersion" value="16" />
+    <preference name="orientation" value="portrait" />
+
+    <platform name="android">
+        <icon src="res/android/ldpi.png" density="ldpi" />
+        <icon src="res/android/mdpi.png" density="mdpi" />
+        <icon src="res/android/hdpi.png" density="hdpi" />
+        <icon src="res/android/xhdpi.png" density="xhdpi" />
+    </platform>
+</widget>
diff --git a/res/android/hdpi.png b/res/android/hdpi.png
new file mode 100644
index 0000000..6883466
--- /dev/null
+++ b/res/android/hdpi.png
diff --git a/res/android/ldpi.png b/res/android/ldpi.png
new file mode 100644
index 0000000..846e193
--- /dev/null
+++ b/res/android/ldpi.png
diff --git a/res/android/mdpi.png b/res/android/mdpi.png
new file mode 100644
index 0000000..6f7a862
--- /dev/null
+++ b/res/android/mdpi.png
diff --git a/res/android/xhdpi.png b/res/android/xhdpi.png
new file mode 100644
index 0000000..29af593
--- /dev/null
+++ b/res/android/xhdpi.png
diff --git a/src/android_error.html b/www/android_error.html
index b39079f..b39079f 100644
--- a/src/android_error.html
+++ b/www/android_error.html
diff --git a/src/css/fms-jquerymobile.css b/www/css/fms-jquerymobile.css
index 18a0287..18a0287 100644
--- a/src/css/fms-jquerymobile.css
+++ b/www/css/fms-jquerymobile.css
diff --git a/src/css/fms.css b/www/css/fms.css
index 1739ece..1739ece 100644
--- a/src/css/fms.css
+++ b/www/css/fms.css
diff --git a/src/css/icons-18-black.css b/www/css/icons-18-black.css
index fe7a839..fe7a839 100644
--- a/src/css/icons-18-black.css
+++ b/www/css/icons-18-black.css
diff --git a/src/css/icons-18-white.css b/www/css/icons-18-white.css
index 24604d2..24604d2 100644
--- a/src/css/icons-18-white.css
+++ b/www/css/icons-18-white.css
diff --git a/src/css/icons-36-black.css b/www/css/icons-36-black.css
index b7d55fe..b7d55fe 100644
--- a/src/css/icons-36-black.css
+++ b/www/css/icons-36-black.css
diff --git a/src/css/icons-36-white.css b/www/css/icons-36-white.css
index 5a3e4b5..5a3e4b5 100644
--- a/src/css/icons-36-white.css
+++ b/www/css/icons-36-white.css
diff --git a/src/css/images/ajax-loader.gif b/www/css/images/ajax-loader.gif
index fd1a189..fd1a189 100644
--- a/src/css/images/ajax-loader.gif
+++ b/www/css/images/ajax-loader.gif
diff --git a/src/css/images/ajax-loader.png b/www/css/images/ajax-loader.png
index 4f40f1a..4f40f1a 100644
--- a/src/css/images/ajax-loader.png
+++ b/www/css/images/ajax-loader.png
diff --git a/src/css/images/icons-18-black.png b/www/css/images/icons-18-black.png
index e991314..e991314 100644
--- a/src/css/images/icons-18-black.png
+++ b/www/css/images/icons-18-black.png
diff --git a/src/css/images/icons-18-white.png b/www/css/images/icons-18-white.png
index b6647d1..b6647d1 100644
--- a/src/css/images/icons-18-white.png
+++ b/www/css/images/icons-18-white.png
diff --git a/src/css/images/icons-36-black.png b/www/css/images/icons-36-black.png
index e09cf3d..e09cf3d 100644
--- a/src/css/images/icons-36-black.png
+++ b/www/css/images/icons-36-black.png
diff --git a/src/css/images/icons-36-white.png b/www/css/images/icons-36-white.png
index d2ca11c..d2ca11c 100644
--- a/src/css/images/icons-36-white.png
+++ b/www/css/images/icons-36-white.png
diff --git a/src/css/jquery.mobile-1.3.1.android.min.css b/www/css/jquery.mobile-1.3.1.android.min.css
index 75a56be..75a56be 100644
--- a/src/css/jquery.mobile-1.3.1.android.min.css
+++ b/www/css/jquery.mobile-1.3.1.android.min.css
diff --git a/src/css/jquery.mobile-1.3.1.min.css b/www/css/jquery.mobile-1.3.1.min.css
index ce17152..ce17152 100644
--- a/src/css/jquery.mobile-1.3.1.min.css
+++ b/www/css/jquery.mobile-1.3.1.min.css
diff --git a/src/css/normalize.css b/www/css/normalize.css
index a9c6f52..a9c6f52 100644
--- a/src/css/normalize.css
+++ b/www/css/normalize.css
diff --git a/src/images/camera.png b/www/images/camera.png
index c3f8d2b..c3f8d2b 100644
--- a/src/images/camera.png
+++ b/www/images/camera.png
diff --git a/src/images/camera@x2.png b/www/images/camera@x2.png
index d5c2467..d5c2467 100644
--- a/src/images/camera@x2.png
+++ b/www/images/camera@x2.png
diff --git a/src/images/crosshairs.png b/www/images/crosshairs.png
index b9513d7..b9513d7 100644
--- a/src/images/crosshairs.png
+++ b/www/images/crosshairs.png
diff --git a/src/images/crosshairs@x2.png b/www/images/crosshairs@x2.png
index fa09399..fa09399 100644
--- a/src/images/crosshairs@x2.png
+++ b/www/images/crosshairs@x2.png
diff --git a/src/images/dropdown-arrow.svg b/www/images/dropdown-arrow.svg
index c416be7..c416be7 100644
--- a/src/images/dropdown-arrow.svg
+++ b/www/images/dropdown-arrow.svg
diff --git a/src/images/gps-marker.svg b/www/images/gps-marker.svg
index b2b8fc5..b2b8fc5 100644
--- a/src/images/gps-marker.svg
+++ b/www/images/gps-marker.svg
diff --git a/src/images/ie_fixed.gif b/www/images/ie_fixed.gif
index 438bd68..438bd68 100644
--- a/src/images/ie_fixed.gif
+++ b/www/images/ie_fixed.gif
diff --git a/src/images/ie_front_logo.gif b/www/images/ie_front_logo.gif
index 34277ea..34277ea 100644
--- a/src/images/ie_front_logo.gif
+++ b/www/images/ie_front_logo.gif
diff --git a/src/images/ie_green_chevron.gif b/www/images/ie_green_chevron.gif
index 341ac1e..341ac1e 100644
--- a/src/images/ie_green_chevron.gif
+++ b/www/images/ie_green_chevron.gif
diff --git a/src/images/ie_key_tools_sprite.gif b/www/images/ie_key_tools_sprite.gif
index aed0baf..aed0baf 100644
--- a/src/images/ie_key_tools_sprite.gif
+++ b/www/images/ie_key_tools_sprite.gif
diff --git a/src/images/ie_key_tools_sprite_dark.gif b/www/images/ie_key_tools_sprite_dark.gif
index 0b2fd57..0b2fd57 100644
--- a/src/images/ie_key_tools_sprite_dark.gif
+++ b/www/images/ie_key_tools_sprite_dark.gif
diff --git a/src/images/ie_logo.gif b/www/images/ie_logo.gif
index 17c9f59..17c9f59 100644
--- a/src/images/ie_logo.gif
+++ b/www/images/ie_logo.gif
diff --git a/src/images/ie_mobileapps.gif b/www/images/ie_mobileapps.gif
index 604efc1..604efc1 100644
--- a/src/images/ie_mobileapps.gif
+++ b/www/images/ie_mobileapps.gif
diff --git a/src/images/ie_mysoc_logo.gif b/www/images/ie_mysoc_logo.gif
index 8df76b2..8df76b2 100644
--- a/src/images/ie_mysoc_logo.gif
+++ b/www/images/ie_mysoc_logo.gif
diff --git a/src/images/ie_sub_map_links_sprite.gif b/www/images/ie_sub_map_links_sprite.gif
index 1afd136..1afd136 100644
--- a/src/images/ie_sub_map_links_sprite.gif
+++ b/www/images/ie_sub_map_links_sprite.gif
diff --git a/src/images/location@x2.png b/www/images/location@x2.png
index 098c6b1..098c6b1 100644
--- a/src/images/location@x2.png
+++ b/www/images/location@x2.png
diff --git a/src/images/mapbg.png b/www/images/mapbg.png
index 462f4fb..462f4fb 100644
--- a/src/images/mapbg.png
+++ b/www/images/mapbg.png
diff --git a/src/images/photos.png b/www/images/photos.png
index 25f967d..25f967d 100644
--- a/src/images/photos.png
+++ b/www/images/photos.png
diff --git a/src/images/photos@x2.png b/www/images/photos@x2.png
index 32a8a31..32a8a31 100644
--- a/src/images/photos@x2.png
+++ b/www/images/photos@x2.png
diff --git a/src/images/pin-green.png b/www/images/pin-green.png
index 8b64d51..8b64d51 100644
--- a/src/images/pin-green.png
+++ b/www/images/pin-green.png
diff --git a/src/images/pin-red.png b/www/images/pin-red.png
index 9b754e4..9b754e4 100644
--- a/src/images/pin-red.png
+++ b/www/images/pin-red.png
diff --git a/src/images/pin-shadow-big.png b/www/images/pin-shadow-big.png
index 113184b..113184b 100644
--- a/src/images/pin-shadow-big.png
+++ b/www/images/pin-shadow-big.png
diff --git a/src/images/pin-shadow.png b/www/images/pin-shadow.png
index 8b47059..8b47059 100644
--- a/src/images/pin-shadow.png
+++ b/www/images/pin-shadow.png
diff --git a/src/images/pin-yellow-big.png b/www/images/pin-yellow-big.png
index 59ed29d..59ed29d 100644
--- a/src/images/pin-yellow-big.png
+++ b/www/images/pin-yellow-big.png
diff --git a/src/images/pin-yellow.png b/www/images/pin-yellow.png
index f9359b0..f9359b0 100644
--- a/src/images/pin-yellow.png
+++ b/www/images/pin-yellow.png
diff --git a/src/images/pin.png b/www/images/pin.png
index 2b6fe51..2b6fe51 100644
--- a/src/images/pin.png
+++ b/www/images/pin.png
diff --git a/src/images/pin.svg b/www/images/pin.svg
index ae97408..ae97408 100644
--- a/src/images/pin.svg
+++ b/www/images/pin.svg
diff --git a/src/images/pin@x2.png b/www/images/pin@x2.png
index 84c5d72..84c5d72 100644
--- a/src/images/pin@x2.png
+++ b/www/images/pin@x2.png
diff --git a/src/images/pin_shadow.png b/www/images/pin_shadow.png
index e769773..e769773 100644
--- a/src/images/pin_shadow.png
+++ b/www/images/pin_shadow.png
diff --git a/src/images/pin_shadow.svg b/www/images/pin_shadow.svg
index 1e9b0eb..1e9b0eb 100644
--- a/src/images/pin_shadow.svg
+++ b/www/images/pin_shadow.svg
diff --git a/src/images/pin_shadow@x2.png b/www/images/pin_shadow@x2.png
index 1e48fe8..1e48fe8 100644
--- a/src/images/pin_shadow@x2.png
+++ b/www/images/pin_shadow@x2.png
diff --git a/src/images/placeholder-photo.png b/www/images/placeholder-photo.png
index 8754722..8754722 100644
--- a/src/images/placeholder-photo.png
+++ b/www/images/placeholder-photo.png
diff --git a/src/images/radar.png b/www/images/radar.png
index 80e1a6c..80e1a6c 100644
--- a/src/images/radar.png
+++ b/www/images/radar.png
diff --git a/src/images/radar.svg b/www/images/radar.svg
index 5422458..5422458 100644
--- a/src/images/radar.svg
+++ b/www/images/radar.svg
diff --git a/src/images/search.png b/www/images/search.png
index 4041d96..4041d96 100644
--- a/src/images/search.png
+++ b/www/images/search.png
diff --git a/src/images/search@x2.png b/www/images/search@x2.png
index ac0a819..ac0a819 100644
--- a/src/images/search@x2.png
+++ b/www/images/search@x2.png
diff --git a/src/images/spinner-black-333.gif b/www/images/spinner-black-333.gif
index 63b3a9d..63b3a9d 100644
--- a/src/images/spinner-black-333.gif
+++ b/www/images/spinner-black-333.gif
diff --git a/src/images/spinner-black.gif b/www/images/spinner-black.gif
index 763c98d..763c98d 100644
--- a/src/images/spinner-black.gif
+++ b/www/images/spinner-black.gif
diff --git a/src/images/spinner-yellow.gif b/www/images/spinner-yellow.gif
index 56eed15..56eed15 100644
--- a/src/images/spinner-yellow.gif
+++ b/www/images/spinner-yellow.gif
diff --git a/src/images/sprite.png b/www/images/sprite.png
index 61c27b3..61c27b3 100644
--- a/src/images/sprite.png
+++ b/www/images/sprite.png
diff --git a/src/images/tile.jpg b/www/images/tile.jpg
index b412774..b412774 100644
--- a/src/images/tile.jpg
+++ b/www/images/tile.jpg
diff --git a/src/images/user.png b/www/images/user.png
index 8b798e1..8b798e1 100644
--- a/src/images/user.png
+++ b/www/images/user.png
diff --git a/src/images/user@x2.png b/www/images/user@x2.png
index b002af1..b002af1 100644
--- a/src/images/user@x2.png
+++ b/www/images/user@x2.png
diff --git a/src/index.html b/www/index.html
index 9146da0..1122007 100644
--- a/src/index.html
+++ b/www/index.html
@@ -35,7 +35,7 @@
         <script type="text/javascript" src="js/mobile_config.js"></script>
         <script type="text/javascript" src="jslib/jquery.mobile-1.3.1.min.js"></script>
         <script type="text/javascript" src="jslib/moment-2.0.0.min.js"></script>
-        <script type="text/javascript" src="../cordova.js"></script>
+        <script type="text/javascript" src="cordova.js"></script>
         <script type="text/javascript" src="js/softkeyboard.js"></script>
 
         <script type="text/javascript" src="jslib/lodash.min.js"></script>
diff --git a/src/js/OpenLayers.Projection.OrdnanceSurvey.js b/www/js/OpenLayers.Projection.OrdnanceSurvey.js
index bb596d3..bb596d3 100644
--- a/src/js/OpenLayers.Projection.OrdnanceSurvey.js
+++ b/www/js/OpenLayers.Projection.OrdnanceSurvey.js
diff --git a/src/js/OpenLayers.fixmystreet.js b/www/js/OpenLayers.fixmystreet.js
index a3466a1..a3466a1 100644
--- a/src/js/OpenLayers.fixmystreet.js
+++ b/www/js/OpenLayers.fixmystreet.js
diff --git a/src/js/app.js b/www/js/app.js
index e6f620f..e6f620f 100644
--- a/src/js/app.js
+++ b/www/js/app.js
diff --git a/www/js/config.js b/www/js/config.js
new file mode 100644
index 0000000..a34cd4b
--- /dev/null
+++ b/www/js/config.js
@@ -0,0 +1,11 @@
+var CONFIG = {
+    DEBUG: 0,
+    TESTING: 0,
+    LANGUAGE: 'en',
+    APP_NAME: 'FixMyStreet',
+    FMS_URL: 'https://www.fixmystreet.com/',
+    NAMESPACE: 'fixmystreet',
+    FILES_DIR: 'fixmystreet_photos',
+    ACCURACY: 750,
+    isUK: 1
+};
diff --git a/src/js/config.js-example b/www/js/config.js-example
index f5648a9..f5648a9 100644
--- a/src/js/config.js-example
+++ b/www/js/config.js-example
diff --git a/src/js/files.js b/www/js/files.js
index eea38c3..eea38c3 100644
--- a/src/js/files.js
+++ b/www/js/files.js
diff --git a/src/js/locate.js b/www/js/locate.js
index 9d631f6..9d631f6 100644
--- a/src/js/locate.js
+++ b/www/js/locate.js
diff --git a/src/js/map-OpenLayers.js b/www/js/map-OpenLayers.js
index 8a60e30..8a60e30 100644
--- a/src/js/map-OpenLayers.js
+++ b/www/js/map-OpenLayers.js
diff --git a/src/js/map-OpenStreetMap.js b/www/js/map-OpenStreetMap.js
index 7467653..7467653 100644
--- a/src/js/map-OpenStreetMap.js
+++ b/www/js/map-OpenStreetMap.js
diff --git a/src/js/map-bing-ol.js b/www/js/map-bing-ol.js
index f39cbf8..f39cbf8 100644
--- a/src/js/map-bing-ol.js
+++ b/www/js/map-bing-ol.js
diff --git a/src/js/map-bing.js b/www/js/map-bing.js
index 715a8ef..715a8ef 100644
--- a/src/js/map-bing.js
+++ b/www/js/map-bing.js
diff --git a/src/js/mobile_config.js b/www/js/mobile_config.js
index 6d0f10a..6d0f10a 100644
--- a/src/js/mobile_config.js
+++ b/www/js/mobile_config.js
diff --git a/src/js/models/draft.js b/www/js/models/draft.js
index ec6cff6..ec6cff6 100644
--- a/src/js/models/draft.js
+++ b/www/js/models/draft.js
diff --git a/src/js/models/report.js b/www/js/models/report.js
index 9e6290c..9e6290c 100644
--- a/src/js/models/report.js
+++ b/www/js/models/report.js
diff --git a/src/js/models/user.js b/www/js/models/user.js
index 0cec52e..0cec52e 100644
--- a/src/js/models/user.js
+++ b/www/js/models/user.js
diff --git a/src/js/router.js b/www/js/router.js
index c691abb..c691abb 100644
--- a/src/js/router.js
+++ b/www/js/router.js
diff --git a/src/js/softkeyboard.js b/www/js/softkeyboard.js
index 9b71d46..9b71d46 100644
--- a/src/js/softkeyboard.js
+++ b/www/js/softkeyboard.js
diff --git a/src/js/strings.js b/www/js/strings.js
index 9cb6ae0..9cb6ae0 100644
--- a/src/js/strings.js
+++ b/www/js/strings.js
diff --git a/src/js/views/around.js b/www/js/views/around.js
index 57b4bc6..57b4bc6 100644
--- a/src/js/views/around.js
+++ b/www/js/views/around.js
diff --git a/src/js/views/details.js b/www/js/views/details.js
index 9f03d58..9f03d58 100644
--- a/src/js/views/details.js
+++ b/www/js/views/details.js
diff --git a/src/js/views/details_extra.js b/www/js/views/details_extra.js
index 160ff11..160ff11 100644
--- a/src/js/views/details_extra.js
+++ b/www/js/views/details_extra.js
diff --git a/src/js/views/existing.js b/www/js/views/existing.js
index a34fd0b..a34fd0b 100644
--- a/src/js/views/existing.js
+++ b/www/js/views/existing.js
diff --git a/src/js/views/fms.js b/www/js/views/fms.js
index 1b51a27..1b51a27 100644
--- a/src/js/views/fms.js
+++ b/www/js/views/fms.js
diff --git a/src/js/views/home.js b/www/js/views/home.js
index 998af1c..998af1c 100644
--- a/src/js/views/home.js
+++ b/www/js/views/home.js
diff --git a/src/js/views/locator.js b/www/js/views/locator.js
index 8e067a9..8e067a9 100644
--- a/src/js/views/locator.js
+++ b/www/js/views/locator.js
diff --git a/src/js/views/login.js b/www/js/views/login.js
index c0f16ba..c0f16ba 100644
--- a/src/js/views/login.js
+++ b/www/js/views/login.js
diff --git a/src/js/views/offline.js b/www/js/views/offline.js
index 5f25223..5f25223 100644
--- a/src/js/views/offline.js
+++ b/www/js/views/offline.js
diff --git a/src/js/views/photo.js b/www/js/views/photo.js
index f24207e..f24207e 100644
--- a/src/js/views/photo.js
+++ b/www/js/views/photo.js
diff --git a/src/js/views/reports.js b/www/js/views/reports.js
index ff65700..ff65700 100644
--- a/src/js/views/reports.js
+++ b/www/js/views/reports.js
diff --git a/src/js/views/save_offline.js b/www/js/views/save_offline.js
index d00170c..d00170c 100644
--- a/src/js/views/save_offline.js
+++ b/www/js/views/save_offline.js
diff --git a/src/js/views/search.js b/www/js/views/search.js
index 6930e2a..6930e2a 100644
--- a/src/js/views/search.js
+++ b/www/js/views/search.js
diff --git a/src/js/views/sent.js b/www/js/views/sent.js
index f25a178..f25a178 100644
--- a/src/js/views/sent.js
+++ b/www/js/views/sent.js
diff --git a/src/js/views/submit.js b/www/js/views/submit.js
index 6a7c946..6a7c946 100644
--- a/src/js/views/submit.js
+++ b/www/js/views/submit.js
diff --git a/src/jslib/OpenLayers-2.10/OpenLayers.js b/www/jslib/OpenLayers-2.10/OpenLayers.js
index 43e67e8..43e67e8 100644
--- a/src/jslib/OpenLayers-2.10/OpenLayers.js
+++ b/www/jslib/OpenLayers-2.10/OpenLayers.js
diff --git a/src/jslib/OpenLayers-2.10/img/blank.gif b/www/jslib/OpenLayers-2.10/img/blank.gif
index 4bcc753..4bcc753 100644
--- a/src/jslib/OpenLayers-2.10/img/blank.gif
+++ b/www/jslib/OpenLayers-2.10/img/blank.gif
diff --git a/src/jslib/OpenLayers-2.10/img/cloud-popup-relative.png b/www/jslib/OpenLayers-2.10/img/cloud-popup-relative.png
index 1215a36..1215a36 100755
--- a/src/jslib/OpenLayers-2.10/img/cloud-popup-relative.png
+++ b/www/jslib/OpenLayers-2.10/img/cloud-popup-relative.png
diff --git a/src/jslib/OpenLayers-2.10/img/crosshairs-100.png b/www/jslib/OpenLayers-2.10/img/crosshairs-100.png
index 82cc769..82cc769 100644
--- a/src/jslib/OpenLayers-2.10/img/crosshairs-100.png
+++ b/www/jslib/OpenLayers-2.10/img/crosshairs-100.png
diff --git a/src/jslib/OpenLayers-2.10/img/crosshairs.png b/www/jslib/OpenLayers-2.10/img/crosshairs.png
index b9513d7..b9513d7 100644
--- a/src/jslib/OpenLayers-2.10/img/crosshairs.png
+++ b/www/jslib/OpenLayers-2.10/img/crosshairs.png
diff --git a/src/jslib/OpenLayers-2.10/img/crosshairs.svg b/www/jslib/OpenLayers-2.10/img/crosshairs.svg
index 2a93690..2a93690 100644
--- a/src/jslib/OpenLayers-2.10/img/crosshairs.svg
+++ b/www/jslib/OpenLayers-2.10/img/crosshairs.svg
diff --git a/src/jslib/OpenLayers-2.10/img/drag-rectangle-off.png b/www/jslib/OpenLayers-2.10/img/drag-rectangle-off.png
index fc6daf4..fc6daf4 100644
--- a/src/jslib/OpenLayers-2.10/img/drag-rectangle-off.png
+++ b/www/jslib/OpenLayers-2.10/img/drag-rectangle-off.png
diff --git a/src/jslib/OpenLayers-2.10/img/drag-rectangle-on.png b/www/jslib/OpenLayers-2.10/img/drag-rectangle-on.png
index 7f783ce..7f783ce 100644
--- a/src/jslib/OpenLayers-2.10/img/drag-rectangle-on.png
+++ b/www/jslib/OpenLayers-2.10/img/drag-rectangle-on.png
diff --git a/src/jslib/OpenLayers-2.10/img/east-mini.png b/www/jslib/OpenLayers-2.10/img/east-mini.png
index 0707567..0707567 100644
--- a/src/jslib/OpenLayers-2.10/img/east-mini.png
+++ b/www/jslib/OpenLayers-2.10/img/east-mini.png
diff --git a/src/jslib/OpenLayers-2.10/img/layer-switcher-maximize.png b/www/jslib/OpenLayers-2.10/img/layer-switcher-maximize.png
index 8d7bb16..8d7bb16 100644
--- a/src/jslib/OpenLayers-2.10/img/layer-switcher-maximize.png
+++ b/www/jslib/OpenLayers-2.10/img/layer-switcher-maximize.png
diff --git a/src/jslib/OpenLayers-2.10/img/layer-switcher-minimize.png b/www/jslib/OpenLayers-2.10/img/layer-switcher-minimize.png
index e80bf21..e80bf21 100644
--- a/src/jslib/OpenLayers-2.10/img/layer-switcher-minimize.png
+++ b/www/jslib/OpenLayers-2.10/img/layer-switcher-minimize.png
diff --git a/src/jslib/OpenLayers-2.10/img/marker-blue.png b/www/jslib/OpenLayers-2.10/img/marker-blue.png
index 83a90b4..83a90b4 100644
--- a/src/jslib/OpenLayers-2.10/img/marker-blue.png
+++ b/www/jslib/OpenLayers-2.10/img/marker-blue.png
diff --git a/src/jslib/OpenLayers-2.10/img/marker-gold.png b/www/jslib/OpenLayers-2.10/img/marker-gold.png
index 2ff9ec5..2ff9ec5 100644
--- a/src/jslib/OpenLayers-2.10/img/marker-gold.png
+++ b/www/jslib/OpenLayers-2.10/img/marker-gold.png
diff --git a/src/jslib/OpenLayers-2.10/img/marker-green.png b/www/jslib/OpenLayers-2.10/img/marker-green.png
index 17168f1..17168f1 100644
--- a/src/jslib/OpenLayers-2.10/img/marker-green.png
+++ b/www/jslib/OpenLayers-2.10/img/marker-green.png
diff --git a/src/jslib/OpenLayers-2.10/img/marker.png b/www/jslib/OpenLayers-2.10/img/marker.png
index ccd1913..ccd1913 100644
--- a/src/jslib/OpenLayers-2.10/img/marker.png
+++ b/www/jslib/OpenLayers-2.10/img/marker.png
diff --git a/src/jslib/OpenLayers-2.10/img/measuring-stick-off.png b/www/jslib/OpenLayers-2.10/img/measuring-stick-off.png
index 70c2dff..70c2dff 100644
--- a/src/jslib/OpenLayers-2.10/img/measuring-stick-off.png
+++ b/www/jslib/OpenLayers-2.10/img/measuring-stick-off.png
diff --git a/src/jslib/OpenLayers-2.10/img/measuring-stick-on.png b/www/jslib/OpenLayers-2.10/img/measuring-stick-on.png
index cdb8f34..cdb8f34 100644
--- a/src/jslib/OpenLayers-2.10/img/measuring-stick-on.png
+++ b/www/jslib/OpenLayers-2.10/img/measuring-stick-on.png
diff --git a/src/jslib/OpenLayers-2.10/img/north-mini.png b/www/jslib/OpenLayers-2.10/img/north-mini.png
index a8a0b40..a8a0b40 100644
--- a/src/jslib/OpenLayers-2.10/img/north-mini.png
+++ b/www/jslib/OpenLayers-2.10/img/north-mini.png
diff --git a/src/jslib/OpenLayers-2.10/img/panning-hand-off.png b/www/jslib/OpenLayers-2.10/img/panning-hand-off.png
index 4c912ac..4c912ac 100644
--- a/src/jslib/OpenLayers-2.10/img/panning-hand-off.png
+++ b/www/jslib/OpenLayers-2.10/img/panning-hand-off.png
diff --git a/src/jslib/OpenLayers-2.10/img/panning-hand-on.png b/www/jslib/OpenLayers-2.10/img/panning-hand-on.png
index 6094c64..6094c64 100644
--- a/src/jslib/OpenLayers-2.10/img/panning-hand-on.png
+++ b/www/jslib/OpenLayers-2.10/img/panning-hand-on.png
diff --git a/src/jslib/OpenLayers-2.10/img/slider.png b/www/jslib/OpenLayers-2.10/img/slider.png
index 23afd57..23afd57 100644
--- a/src/jslib/OpenLayers-2.10/img/slider.png
+++ b/www/jslib/OpenLayers-2.10/img/slider.png
diff --git a/src/jslib/OpenLayers-2.10/img/south-mini.png b/www/jslib/OpenLayers-2.10/img/south-mini.png
index 6c4ac8a..6c4ac8a 100644
--- a/src/jslib/OpenLayers-2.10/img/south-mini.png
+++ b/www/jslib/OpenLayers-2.10/img/south-mini.png
diff --git a/src/jslib/OpenLayers-2.10/img/west-mini.png b/www/jslib/OpenLayers-2.10/img/west-mini.png
index db5f420..db5f420 100644
--- a/src/jslib/OpenLayers-2.10/img/west-mini.png
+++ b/www/jslib/OpenLayers-2.10/img/west-mini.png
diff --git a/src/jslib/OpenLayers-2.10/img/zoom-minus-mini.png b/www/jslib/OpenLayers-2.10/img/zoom-minus-mini.png
index f9b63ab..f9b63ab 100644
--- a/src/jslib/OpenLayers-2.10/img/zoom-minus-mini.png
+++ b/www/jslib/OpenLayers-2.10/img/zoom-minus-mini.png
diff --git a/src/jslib/OpenLayers-2.10/img/zoom-plus-mini.png b/www/jslib/OpenLayers-2.10/img/zoom-plus-mini.png
index eecf2eb..eecf2eb 100644
--- a/src/jslib/OpenLayers-2.10/img/zoom-plus-mini.png
+++ b/www/jslib/OpenLayers-2.10/img/zoom-plus-mini.png
diff --git a/src/jslib/OpenLayers-2.10/img/zoom-world-mini.png b/www/jslib/OpenLayers-2.10/img/zoom-world-mini.png
index 2159dde..2159dde 100644
--- a/src/jslib/OpenLayers-2.10/img/zoom-world-mini.png
+++ b/www/jslib/OpenLayers-2.10/img/zoom-world-mini.png
diff --git a/src/jslib/OpenLayers-2.10/img/zoombar.png b/www/jslib/OpenLayers-2.10/img/zoombar.png
index 959f01a..959f01a 100644
--- a/src/jslib/OpenLayers-2.10/img/zoombar.png
+++ b/www/jslib/OpenLayers-2.10/img/zoombar.png
diff --git a/src/jslib/OpenLayers-2.10/license.txt b/www/jslib/OpenLayers-2.10/license.txt
index 598af50..598af50 100644
--- a/src/jslib/OpenLayers-2.10/license.txt
+++ b/www/jslib/OpenLayers-2.10/license.txt
diff --git a/src/jslib/OpenLayers-2.10/theme/default/framedCloud.css b/www/jslib/OpenLayers-2.10/theme/default/framedCloud.css
index e69de29..e69de29 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/framedCloud.css
+++ b/www/jslib/OpenLayers-2.10/theme/default/framedCloud.css
diff --git a/src/jslib/OpenLayers-2.10/theme/default/google.css b/www/jslib/OpenLayers-2.10/theme/default/google.css
index 3c1c187..3c1c187 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/google.css
+++ b/www/jslib/OpenLayers-2.10/theme/default/google.css
diff --git a/src/jslib/OpenLayers-2.10/theme/default/ie6-style.css b/www/jslib/OpenLayers-2.10/theme/default/ie6-style.css
index 65f6b19..65f6b19 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/ie6-style.css
+++ b/www/jslib/OpenLayers-2.10/theme/default/ie6-style.css
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/add_point_off.png b/www/jslib/OpenLayers-2.10/theme/default/img/add_point_off.png
index aefd09c..aefd09c 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/add_point_off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/add_point_off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/add_point_on.png b/www/jslib/OpenLayers-2.10/theme/default/img/add_point_on.png
index 1294a2c..1294a2c 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/add_point_on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/add_point_on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/blank.gif b/www/jslib/OpenLayers-2.10/theme/default/img/blank.gif
index 4bcc753..4bcc753 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/blank.gif
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/blank.gif
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/close.gif b/www/jslib/OpenLayers-2.10/theme/default/img/close.gif
index a8958de..a8958de 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/close.gif
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/close.gif
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/drag-rectangle-off.png b/www/jslib/OpenLayers-2.10/theme/default/img/drag-rectangle-off.png
index fc6daf4..fc6daf4 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/drag-rectangle-off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/drag-rectangle-off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/drag-rectangle-on.png b/www/jslib/OpenLayers-2.10/theme/default/img/drag-rectangle-on.png
index 7f783ce..7f783ce 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/drag-rectangle-on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/drag-rectangle-on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/draw_line_off.png b/www/jslib/OpenLayers-2.10/theme/default/img/draw_line_off.png
index 7f15612..7f15612 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/draw_line_off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/draw_line_off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/draw_line_on.png b/www/jslib/OpenLayers-2.10/theme/default/img/draw_line_on.png
index ba09186..ba09186 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/draw_line_on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/draw_line_on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/draw_point_off.png b/www/jslib/OpenLayers-2.10/theme/default/img/draw_point_off.png
index fde94bd..fde94bd 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/draw_point_off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/draw_point_off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/draw_point_on.png b/www/jslib/OpenLayers-2.10/theme/default/img/draw_point_on.png
index 8804221..8804221 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/draw_point_on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/draw_point_on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/draw_polygon_off.png b/www/jslib/OpenLayers-2.10/theme/default/img/draw_polygon_off.png
index 53ce9d7..53ce9d7 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/draw_polygon_off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/draw_polygon_off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/draw_polygon_on.png b/www/jslib/OpenLayers-2.10/theme/default/img/draw_polygon_on.png
index 2a33376..2a33376 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/draw_polygon_on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/draw_polygon_on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/editing_tool_bar.png b/www/jslib/OpenLayers-2.10/theme/default/img/editing_tool_bar.png
index 464340e..464340e 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/editing_tool_bar.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/editing_tool_bar.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/move_feature_off.png b/www/jslib/OpenLayers-2.10/theme/default/img/move_feature_off.png
index 9f588db..9f588db 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/move_feature_off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/move_feature_off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/move_feature_on.png b/www/jslib/OpenLayers-2.10/theme/default/img/move_feature_on.png
index 072f066..072f066 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/move_feature_on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/move_feature_on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/navigation_history.png b/www/jslib/OpenLayers-2.10/theme/default/img/navigation_history.png
index 053d1e0..053d1e0 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/navigation_history.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/navigation_history.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/overview_replacement.gif b/www/jslib/OpenLayers-2.10/theme/default/img/overview_replacement.gif
index a82cf5f..a82cf5f 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/overview_replacement.gif
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/overview_replacement.gif
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/pan-panel-NOALPHA.png b/www/jslib/OpenLayers-2.10/theme/default/img/pan-panel-NOALPHA.png
index 2740d8b..2740d8b 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/pan-panel-NOALPHA.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/pan-panel-NOALPHA.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/pan-panel.png b/www/jslib/OpenLayers-2.10/theme/default/img/pan-panel.png
index 9910121..9910121 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/pan-panel.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/pan-panel.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/pan_off.png b/www/jslib/OpenLayers-2.10/theme/default/img/pan_off.png
index 30b2aed..30b2aed 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/pan_off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/pan_off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/pan_on.png b/www/jslib/OpenLayers-2.10/theme/default/img/pan_on.png
index d73e7dd..d73e7dd 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/pan_on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/pan_on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/panning-hand-off.png b/www/jslib/OpenLayers-2.10/theme/default/img/panning-hand-off.png
index 4c912ac..4c912ac 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/panning-hand-off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/panning-hand-off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/panning-hand-on.png b/www/jslib/OpenLayers-2.10/theme/default/img/panning-hand-on.png
index 6094c64..6094c64 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/panning-hand-on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/panning-hand-on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/remove_point_off.png b/www/jslib/OpenLayers-2.10/theme/default/img/remove_point_off.png
index 76c8606..76c8606 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/remove_point_off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/remove_point_off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/remove_point_on.png b/www/jslib/OpenLayers-2.10/theme/default/img/remove_point_on.png
index 0ff28fc..0ff28fc 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/remove_point_on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/remove_point_on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/ruler.png b/www/jslib/OpenLayers-2.10/theme/default/img/ruler.png
index aa4883b..aa4883b 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/ruler.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/ruler.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/save_features_off.png b/www/jslib/OpenLayers-2.10/theme/default/img/save_features_off.png
index 2bf2906..2bf2906 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/save_features_off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/save_features_off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/save_features_on.png b/www/jslib/OpenLayers-2.10/theme/default/img/save_features_on.png
index 93c8f08..93c8f08 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/save_features_on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/save_features_on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/view_next_off.png b/www/jslib/OpenLayers-2.10/theme/default/img/view_next_off.png
index 23c5ac1..23c5ac1 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/view_next_off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/view_next_off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/view_next_on.png b/www/jslib/OpenLayers-2.10/theme/default/img/view_next_on.png
index e41fb7b..e41fb7b 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/view_next_on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/view_next_on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/view_previous_off.png b/www/jslib/OpenLayers-2.10/theme/default/img/view_previous_off.png
index b9c230f..b9c230f 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/view_previous_off.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/view_previous_off.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/view_previous_on.png b/www/jslib/OpenLayers-2.10/theme/default/img/view_previous_on.png
index c009c25..c009c25 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/view_previous_on.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/view_previous_on.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/zoom-panel-NOALPHA.png b/www/jslib/OpenLayers-2.10/theme/default/img/zoom-panel-NOALPHA.png
index cdde6fc..cdde6fc 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/zoom-panel-NOALPHA.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/zoom-panel-NOALPHA.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/img/zoom-panel.png b/www/jslib/OpenLayers-2.10/theme/default/img/zoom-panel.png
index f2c7c51..f2c7c51 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/img/zoom-panel.png
+++ b/www/jslib/OpenLayers-2.10/theme/default/img/zoom-panel.png
diff --git a/src/jslib/OpenLayers-2.10/theme/default/style.css b/www/jslib/OpenLayers-2.10/theme/default/style.css
index 0627f0e..0627f0e 100644
--- a/src/jslib/OpenLayers-2.10/theme/default/style.css
+++ b/www/jslib/OpenLayers-2.10/theme/default/style.css
diff --git a/src/jslib/backbone-min.js b/www/jslib/backbone-min.js
index d4b0314..d4b0314 100644
--- a/src/jslib/backbone-min.js
+++ b/www/jslib/backbone-min.js
diff --git a/src/jslib/backbone.localStorage-min.js b/www/jslib/backbone.localStorage-min.js
index fba52a5..fba52a5 100644
--- a/src/jslib/backbone.localStorage-min.js
+++ b/www/jslib/backbone.localStorage-min.js
diff --git a/src/jslib/backbone.localStorage.js b/www/jslib/backbone.localStorage.js
index 97ab217..97ab217 100644
--- a/src/jslib/backbone.localStorage.js
+++ b/www/jslib/backbone.localStorage.js
diff --git a/src/jslib/jquery-1.9.1.min.js b/www/jslib/jquery-1.9.1.min.js
index 006e953..006e953 100644
--- a/src/jslib/jquery-1.9.1.min.js
+++ b/www/jslib/jquery-1.9.1.min.js
diff --git a/src/jslib/jquery.mobile-1.3.1.min.js b/www/jslib/jquery.mobile-1.3.1.min.js
index 4622a1e..4622a1e 100644
--- a/src/jslib/jquery.mobile-1.3.1.min.js
+++ b/www/jslib/jquery.mobile-1.3.1.min.js
diff --git a/src/jslib/jquery.validate.min.js b/www/jslib/jquery.validate.min.js
index cc0414e..cc0414e 100644
--- a/src/jslib/jquery.validate.min.js
+++ b/www/jslib/jquery.validate.min.js
diff --git a/src/jslib/json2.js b/www/jslib/json2.js
index 3b0c872..3b0c872 100644
--- a/src/jslib/json2.js
+++ b/www/jslib/json2.js
diff --git a/src/jslib/lodash.min.js b/www/jslib/lodash.min.js
index 42897ce..42897ce 100644
--- a/src/jslib/lodash.min.js
+++ b/www/jslib/lodash.min.js
diff --git a/src/jslib/moment-2.0.0.min.js b/www/jslib/moment-2.0.0.min.js
index 4e8497a..4e8497a 100644
--- a/src/jslib/moment-2.0.0.min.js
+++ b/www/jslib/moment-2.0.0.min.js
diff --git a/src/templates/en/address_search.html b/www/templates/en/address_search.html
index b8bc71e..b8bc71e 100644
--- a/src/templates/en/address_search.html
+++ b/www/templates/en/address_search.html
diff --git a/www/templates/en/android_error.html b/www/templates/en/android_error.html
new file mode 100644
index 0000000..b39079f
--- /dev/null
+++ b/www/templates/en/android_error.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title></title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" />
+        <meta charset="utf-8">
+
+        <link rel="stylesheet" href="css/fms.css" type="text/css" media="screen" title="no title" charset="utf-8">
+
+    </head>
+    <body>
+    <div id="load-screen">
+        <div class="radar"></div>
+        <p>There seems to have been a problem starting the app. Please quit and try again</p>
+    </div>
+    </body>
+</html>
diff --git a/src/templates/en/around.html b/www/templates/en/around.html
index 47bc329..47bc329 100644
--- a/src/templates/en/around.html
+++ b/www/templates/en/around.html
diff --git a/src/templates/en/details.html b/www/templates/en/details.html
index 08b2876..08b2876 100644
--- a/src/templates/en/details.html
+++ b/www/templates/en/details.html
diff --git a/src/templates/en/details_extra.html b/www/templates/en/details_extra.html
index 63535d6..63535d6 100644
--- a/src/templates/en/details_extra.html
+++ b/www/templates/en/details_extra.html
diff --git a/src/templates/en/existing.html b/www/templates/en/existing.html
index 5e27785..5e27785 100644
--- a/src/templates/en/existing.html
+++ b/www/templates/en/existing.html
diff --git a/src/templates/en/help.html b/www/templates/en/help.html
index f8bd8aa..f8bd8aa 100644
--- a/src/templates/en/help.html
+++ b/www/templates/en/help.html
diff --git a/src/templates/en/home.html b/www/templates/en/home.html
index e8e0e8c..e8e0e8c 100644
--- a/src/templates/en/home.html
+++ b/www/templates/en/home.html
diff --git a/src/templates/en/initial_help.html b/www/templates/en/initial_help.html
index 45b4961..45b4961 100644
--- a/src/templates/en/initial_help.html
+++ b/www/templates/en/initial_help.html
diff --git a/src/templates/en/login.html b/www/templates/en/login.html
index 13944e8..13944e8 100644
--- a/src/templates/en/login.html
+++ b/www/templates/en/login.html
diff --git a/src/templates/en/offline.html b/www/templates/en/offline.html
index 10e87d9..10e87d9 100644
--- a/src/templates/en/offline.html
+++ b/www/templates/en/offline.html
diff --git a/src/templates/en/photo.html b/www/templates/en/photo.html
index aa44e9e..aa44e9e 100644
--- a/src/templates/en/photo.html
+++ b/www/templates/en/photo.html
diff --git a/src/templates/en/reports.html b/www/templates/en/reports.html
index 047fa76..047fa76 100644
--- a/src/templates/en/reports.html
+++ b/www/templates/en/reports.html
diff --git a/src/templates/en/save_offline.html b/www/templates/en/save_offline.html
index 2cafbbc..2cafbbc 100644
--- a/src/templates/en/save_offline.html
+++ b/www/templates/en/save_offline.html
diff --git a/src/templates/en/sent.html b/www/templates/en/sent.html
index f4f1541..f4f1541 100644
--- a/src/templates/en/sent.html
+++ b/www/templates/en/sent.html
diff --git a/src/templates/en/submit.html b/www/templates/en/submit.html
index a36d1e2..a36d1e2 100644
--- a/src/templates/en/submit.html
+++ b/www/templates/en/submit.html
diff --git a/src/templates/en/submit_confirm.html b/www/templates/en/submit_confirm.html
index 0bca06d..0bca06d 100644
--- a/src/templates/en/submit_confirm.html
+++ b/www/templates/en/submit_confirm.html
diff --git a/src/templates/en/submit_email.html b/www/templates/en/submit_email.html
index 3eaf26a..3eaf26a 100644
--- a/src/templates/en/submit_email.html
+++ b/www/templates/en/submit_email.html
diff --git a/src/templates/en/submit_name.html b/www/templates/en/submit_name.html
index 98a48f6..98a48f6 100644
--- a/src/templates/en/submit_name.html
+++ b/www/templates/en/submit_name.html
diff --git a/src/templates/en/submit_password.html b/www/templates/en/submit_password.html
index fb61d20..fb61d20 100644
--- a/src/templates/en/submit_password.html
+++ b/www/templates/en/submit_password.html
diff --git a/src/templates/en/submit_set_password.html b/www/templates/en/submit_set_password.html
index ccecd35..ccecd35 100644
--- a/src/templates/en/submit_set_password.html
+++ b/www/templates/en/submit_set_password.html