Prevent Sunflower-specific styles from affecting default theme
Import: Reuse cached copies of downloaded files in prepop
GIS: Allow setting of per-feature styles  in prepop, fix per-feature
style
Languages: Improve fr.py
Merge branch 'master' of git://github.com/nursix/eden
Minify
CRMT2 tweaks
AssignedRolesTable
AssignedRolesTable
Merge pull request #945 from eimmirzi/AssignedRoles

AssignedRolesTable
use the converse.nojquery.js file to avoid loading jquery twice.
Merge pull request #948 from graeme-f/master

use the converse.nojquery.js file to avoid loading jquery twice.
Fix compilation issues with converse.nojquery.js, Minify
Rename S3LocationSelectorWidget2 into simply S3LocationSelector,
restructure under new S3Selector baseclass (to be re-used for
S3AddPersonWidget2), refactor for JSON-based single input, separate
validation from post-processing, remove separate post-process validator,
rewrite JS as UI widget, encapsulate all client-side processing (all
that in preparation for integration with S3SQLInlineComponent, and to
allow multiple selectors per page), some bug fixes/cleanups. This is
WIP, inline component integration to follow in separate commit.
GIS: Extend GeoJSON Layers to support uploading files
Doc: Fix validation of Images (should fail if neither URL nor file present)
Some language consistency tweaks & minor cleanups
Merge branch 'master' of git://github.com/nursix/eden
Prevent triggering Geocoder during location selector refresh, bug fix
S3LocationSelector, use widget validation in S3CRUD.validate
GIS: Support strokeDashStyle
Fix #1634
Merge branch 'master' of github.com:flavour/eden
Postprocess of S3Selector in S3SQLInlineComponent.accept
Fugbix