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