LILY-323: Fix back button for contact edit/add form
LILY-323: Fix back button for contact edit/add form
Merge branch 'feature/LILY-323-fix-contact-back-button' into develop
Update django to 1.6
Merge pull request #14 from HelloLily/feature/django-update

Feature/django update to 1.6
Added get_main_address function
LILY 257 & 261: Improved contact and account detail view
Merge branch 'feature/account-contact-detail-improvements' into develop
LILY-311: Made sure confirm close popup isn't displayed all the time
Merge branch 'feature/LILY-311-disable-alert-for-certain-elements' into develop
LILY-109: Add fixed extensions for some mimetypes because it's hard to trust the suggested extensions to make the preferred choice.
Merge branch 'feature/add-preset-mimetypes-109' into develop
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
Merge branch 'feature/disable-untrusted-email-html-tags-120' into develop
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