Fix 500 bug identified by smoke tests
Fix #1406: duplicate left joins with multiple orderby-fields.
Vulnerability: Fix for popup IDs, update jQueryUI to 1.10.2, update
GoogleEarth GXP plugin
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/flavour/eden