Better handling of SelectControl in ushahidi.js #780

Ushahidi.js now uses just one select control, and adds additional
layers to the control as they're loaded. This enables all layers to
be clickable at once. This should cover reports, sharing, kml and
checkin layers as they're all Vector layers.
Update i18n submodule
Add new lines between phone number #879

Also change <strong> tagging on phone numbers to match other ways to report
Add new lines between phone numnbers (unicorn theme) #879
Don't append country name to locations in /admin/reports. Fixes #880

Country was being appended even on multi country deployments.
This isn't appended in the frontend so I've removed it from the backend
entirely for consistency and simplicity.
Fixes issue #882 - No event to change members main tabs
Further JSON controller tweaks #853

* Make _get_geometry protected not private to allow overriding
  markers_json()
* Add events for tweaking the marker color / icon
* Pass marker link to _get_geometry
Merge branch 'develop' of git://github.com/ushahidi/Ushahidi_Web into develop
Handle table prefix in User_Model::delete() #883
Merge branch '2.6-fixes' into develop
Ushahidi.js : Save layer timeouts by layer name #780

This allows muleiple laters to load at once, but still debounces
multiple loads of the same layer (due to fast zoom changes etc).
This stops issues with the kmlonbydefault plugin breaking the base
reports layer.
Merge branch 'multiple-clickable-layers' into develop

Conflicts:
	media/js/ushahidi.js
Fix loading checkin layer #885

* Clean up checkin loading code
* Move custom feature loading and process to main_js
* Pass features rather than a callback directly to Ushahidi.Map.addLayer()
* Make sure layer is displayed (faded in) when added to the map.
Keep reports / checkin layers on top #780

* Add option to Ushahidi.Map.addLayer() to keep a layer on top
* Ushahidi.Map.keepOnTop() is run each time a layer is added and pushes
  layers to the top using OpenLayers.Map.raiseLayer()
Fix upgrade54-55.sql to work with the auto upgrader #886
Fix upgrade 55-56 #886
Remove corrupt unicode whitespace in upgrade64-65.sql #886

Also add missing backticks around table name
Merge branch 'upgrade54-55-fix' into develop

Conflicts:
	application/i18n
Make map helper work with TMS layers too #881
Merge pull request #884 from rjmackay/2.6-fixes

Fixes to be review and merged after code freeze