Merge branch 'develop'
Merge branch 'develop'
LILY-323: Fix back button for contact edit/add form
Update django to 1.6
Added get_main_address function
LILY 257 & 261: Improved contact and account detail view
LILY-311: Made sure confirm close popup isn't displayed all the time
LILY-109: Add fixed extensions for some mimetypes because it's hard to trust the suggested extensions to make the preferred choice.
LILY-120, disable certain html tags when parsing and sending email messages.
Don't trust message_part.get_content_charset(), use it as fallback only
LILY-206: Remove referrers to big objects (analyzed with `meminspect`) and force call to garbage collect.
Remove `rusage.ru_maxrss` prints in tasks.
Fix not clearing `query_count`, `total_query_string` and `param_list` for batch jobs.
Added pympler and psutil to requirements (used by lily's meminspect and celery's sample_mem).
Add celery to newrelic
Add maxtasksperchild and autoscale arguments for the dyno 'worker1'
Add debugging information for get_task_count
Fix meminspect to work with logger objects and sys
Fix mail sync in task 'retrieve_new_emails_for', prevent deleting emails not matched by CRITERIA from ALLMAIL every time.
Experiment with eventlet for CELERYD_POOL instead of regular processes.
Restore --maxtasksperchild for worker3
Lower concurrency for worker3
Change IronMQ host to EU