Complete org_SiteRepresent by supporting show_link=True
Merge pull request #547 from graeme-f/master

Guided Tour Functionality
InlineComponent: catch ajax error.
Move Site<>FacilityType to a link table rather than a list:reference.
Upgrade jQuery to 1.10.2. Start work on S3AddPersonWidget2
Merge branch 'master' of git://github.com/nursix/eden
& fix Tours
S3LocationSelector2 supports Postcodes & Polygons
guided tour fix - allow for multiple args
Fix tour for MySQL, fix broken unit tests (facility_type_id).
S3SQLInlineComponent: fall back to resource-orderby if no orderby specified, S3Resource.select: always retain rows order
Potential fix for IS_ONE_OF orderby-bug (?)
LocatioNSelector2 work-in-progress: hide_lx, reverse_lx, geocoder options. Update bundled geopy
Merge branch 'master' of git://github.com/nursix/eden
Merge pull request #549 from graeme-f/master

guided tour fix - allow for multiple args
Bugfix S3AddPersonWidget, DRMP: Hide email addresses & Tel#s if not
logged-in
LACRMT Changes
* Organisations don't have coalitions
* Add & fix Org Sector & Service imports
* Add & Config Sample Org Report
* Formatting of Inline Fields
Bulk-capable S3Represents for Items & Item Categories. WMS fixes.
Merge branch 'master' of git://github.com/michaelhowden/eden
Report2, UTF-8 fix
Updated zh_cn  translation from IFRC
 Retrieve Database Strings

Database strings upd

Database Strings

Database Strings