Merge branch 'hotfix/0.2.32.2'
Fixed js and added indexes for email
Merge branch 'hotfix/0.2.32.3'
Fix typo in label of smtp_host field
Hotfix: Add phone numbers to account
Finished hotfix 0.2.32.4.

Conflicts:
	lily/static/lily/scripts/forms/select2.js
LILY-514: fixed registration & user invite
Merge branch 'release/0.2.33'
LILY-476: Add 'send and archive' button
Merge branch 'feature/LILY-476-add-send-archive-button' into develop
Upgrading staging env to Cedar-14
Merge branch 'master' into develop
LILY-500: Added angular
LILY-500: Added angular bootstrap files
LILY-500: Added angular bootstrap files
LILY-500: made contact list view angularized

Still to do:
- keep filter, sorting & ordering in cache
- make export work again (through search backend)
LILY-525: cache ordering/sorting and filter in contact list view
LILY-500: made contact list view angularized

Still to do:
- keep filter, sorting & ordering in cache
- make export work again (through search backend)
LILY-524:  Made search api separate from view
LILY-500: made contact list view angularized

Still to do:
- keep filter, sorting & ordering in cache
- make export work again (through search backend)