ready for deploy
Merge branch 'develop'
This commit was previously reverted in develop:

LILY-173 convert invitations to new template

The Metronic template is now in use on the invitation page.

To minimize code reuse, a new block {% block form-formsets %} has been added to
form.html.

Conflicts:
	lily/users/forms.py
Revert "This commit was previously reverted in develop:"

This reverts commit da7fe19b91398563359b5703f21e082f9c837e21.
The revert which was previously reverted, has been been reverted back.

LILY-173 convert invitations to new template

The Metronic template is now in use on the invitation page.

To minimize code reuse, a new block {% block form-formsets %} has been added to
form.html.

Conflicts:
	lily/users/forms.py
LILY-13 Convert invitations to new template

The accept and accept_invalid were previously not converted to the new
templates.
Fix: illegal state bug in email detail view
Fixed counts of email/deals/cases in DetailViews of Contact and Account
Merge branch 'develop' of github.com:HelloLily/hellolily into develop
LILY-220: Add Archived mixin for model
LILY-220: add archive option to Case class
LILY-220: start with view for archiving cases
LILY-220: progress for archiving cases

- added custom manager for bulk archive
- changed fields on model, now only date time when archived
update generatemedianames
LILY-220: update to case archiving:

- make it possible to bulk select cases for bulk actions
- custom query command for bulk update
TODO: catch multi pks for updating
Make untranslatable text translatable in account list view
LILY-220: fixed multi/single object_id's. Removed timestamp archived
LILY-220: filter for list views as a mixin
LILY-220: split out retrieving object_pks and added succes_message
LILY-220: cleanup the code