Deploy: custom maxlength for Sender and Subject in inbox view
Adding keywords for Sunflower testing; Fixing Independent test running
Merge pull request #792 from arnavsharma93/GSOC_2

Adding keywords for Sunflower testing; Fixing Independent test running
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/flavour/eden
LK template
CAP controller's custom_submit buttons are done in a formstyle-friendly
way
Minify
Convert imported CAP polygon and circle data. Make update_alert_id not ticket.
CAP: Export buttons
Merge pull request #804 from somayjain/master

Invalid login in inline forms from non-default modules broken
Merge pull request #805 from ptressel/cap_area

Cap area
Cleanups
Merge branch 'master' of git://github.com/flavour/eden
CAP: Template, Add layer to Map (polygon styling to be improved),
Locations also added via Alert tab to simplify UI.
CAP tweaks: filer info_id/area_id dropdowns by Alert, don't show Locations
tab unless Area has been created.
CAP: Custom methos to import feeds
Merge branch 'master' of git://github.com/flavour/eden
Fix issue with join extraction from S3ResourceQuery/Query combinations
CAP: Start RSS Parser
Language Tweaks
Fix hierarchy widget for HTML type node representation, more fixes for mixed S3ResourceQuery/Query
Merge branch 'master' of git://github.com/nursix/eden