A number of improvements, including making notifications fade out, profile page cards layout has been fixed to reduce height of author details, adjusted the card width on the show more popup on profile pages, improvements to the main nav so it handles smaller screen sizes, changed images on main homepage and text, layout improvements to forms of resources and projects pages and other minor tweaks and improvemnts
Backport fix for group messages.
Merge branch 'master' of git://github.com/catalpainternational/eden
Merge branch 'master' of git://github.com/flavour/eden
Refactor process_outbox to stop outbox jamming, incl. unit tests
max_send_retries for process_outbox.
Cleanup, bugfix S3LocatioNSelectorWidget2 when there is a single country
Merge branch 'master' of git://github.com/nursix/eden

Conflicts:
	VERSION
DRMP: Change checkboxes -> multiselect dropdowns
bugfix
Bugfix CSV Importer, Allow Custom import onaccept functions, Use one of
these in CRMT to link Facilities to Coalitions
Audit cleanup. Bugfix inline uploads. CRMT: Use Audit for Site Activity
Log (incomplete), tweak homepage CSS after DRMP updates
Prevent jQuery.ajax preFilter from mis-interpreting double question marks in POST JSON (http://bugs.jquery.com/ticket/8417)
Merge branch 'master' of git://github.com/flavour/eden
LACRMT Updates
* Fix Error in s3aaa when updating Organisation
* CSS to make summary charts visible in LACRMT (Can be revised later)
* Location Label -> Address
* Permissions for Authenticated User to use Person Widget
* Trim Facility Name on Import
Filter/Report form auto-submit option.
CRMT Summary Maps need ajax_init=True, activate filter-auto-submit in CRMT
CRMT: Deactivate charts tab until ready, fix map being partially hidden behind filter form
audit fix, forms fix, i18n tweaks, minify, tet translation (ignored by web2py without this patch:
https://code.google.com/p/web2py/issues/detail?id=1680)
Merge & Cleanup branch 'master' of git://github.com/michaelhowden/eden