Merge branch 'release/0.2.13' into develop
LILY-393: Fix registration form
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
Merge branch 'release/0.2.14'