Merge branch 'release/0.2.33'
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)
LILY-527: account list in ES & angular
LILY-521: Automatically load default email template
Merge branch 'feature/awesome-email-templates' into develop
LILY-527: fixup account list angular
LILY-411: Replace existing email template when selecting a new one
Merge branch 'feature/LILY-411-replaceable-email-templates' into develop
Fix filterquery not working when q is set for ElasticSearch
fix after Bob splitting of search view into util view