Merge branch 'hotfix/0.2.12.3'
Merge branch 'release/0.2.13'
include ugettext in email.utils
Merge branch 'hotfix/email-utils-include-ugettext' into develop
LILY-395: fixed soft delete for accounts and contacts

make quick contact form add email
LILY-394: make registration optional closed
LILY-373: Replaced wysihtml5 for wysihtml5x for double linebreaks