Merge branch 'feature/theme-metronic'
Revert "LILY-173 convert invitations to new template"

This reverts commit 1c9ae4f763bbb8ffe9b9583017edf4425b458566.
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	lily/users/forms.py
Merge branch 'develop'
Merge branch 'develop'
Ready for deploy
Ready for deploy