Forgot one.
Fix Import crash, Fix Errors being lost for AddPersonWidget
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/flavour/eden
Filter by Type
Bugfix for S3SQLInlineComponentCheckbox
CSS Tweak (un dl-item), 6 on 1st page to avoid initial AJAX call
TLDRMP template/theme -> DRMP
Bootstrap added, with example DRMP template making use of it
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.