Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/eden
Interim-save button as deployment-setting, option for additional custom
submit-buttons (no hooks other than interim-save yet, though).
Fall back to standard SQLFORM submit-button if no custom-submit
Read interim_save in CRUD rather than 00_settings.
All-round solution for correct quoting of tuids.
CSN: Base template/theme. CMS Post Import supports specific Locations, Markers for some Social Media
Workaround inconsistent result type in Field.retrieve, several bug fixes
.
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	private/templates/CSN/tasks.cfg
S3OptionsFilter with DDCL (Dropdown-Checklist) widget.
Bug fix.
Clearer option/class names.
Also integrate David Stutz' bootstrap-multiselect (as alternative option), automatically add filter to multiselect-search-widget if number(options) > 5.
multiselect-search => multiselect-filter (to not confuse with S3Search)
CSN Demo progress, merge nursix
Merge branch 'master' of git://github.com/nursix/eden
S3MultiSelectWidget uses jQueryUI MultiSelect instead of ui.multiselect. Enable this for Sectors & Skills
jQuery -> 1.9.1 (migration mode enabled for now), jQueryUI -> 1.10.1, Replace Colorbox with jQueryUI Modal, EUROSHA project/project_location custom forms
Merge branch 'master' of git://github.com/flavour/eden