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.
Merge branch 'develop' of git://github.com/ushahidi/Ushahidi_Web into develop
Update i18n with ga_IE translations
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
Merge branch '2.6-fixes' into develop
Merge branch 'multiple-clickable-layers' into develop

Conflicts:
	media/js/ushahidi.js
Merge branch 'upgrade54-55-fix' into develop

Conflicts:
	application/i18n
Make map helper work with TMS layers too #881
Closes issue #891 - No hook for getting the incident object from the member's report controller
Merge branch '2.6b' into develop
Merge branch 'develop' of git://github.com/ushahidi/Ushahidi_Web into develop
Merge branch '2.6b' into develop
Fix handling for layer urls with query parameters

Conflicts:

	application/i18n
	media/js/ushahidi.js
Merge branch '2.6b' into develop