Merge branch 'master' into development

# Conflicts:
#	cps/templates/email_edit.html

cps/templates/email_edit.html

@@ -26,11 +26,11 @@
     <div data-related="email-settings-0">
       <div class="form-group">
         <label for="mail_server">{{_('SMTP Hostname')}}</label>
-        <input type="text" class="form-control" name="mail_server" id="mail_server" value="{{content.mail_server}}">
+        <input type="text" class="form-control" name="mail_server" id="mail_server" value="{{content.mail_server}}" required>
       </div>
       <div class="form-group">
         <label for="mail_port">{{_('SMTP Port')}}</label>
-        <input type="number" min="1" max="65535" step="1" class="form-control" name="mail_port" id="mail_port" value="{% if content.mail_port != None %}{{ content.mail_port }}{% endif %}" autocomplete="off">
+        <input type="number" min="1" max="65535" step="1" class="form-control" name="mail_port" id="mail_port" value="{% if content.mail_port != None %}{{ content.mail_port }}{% endif %}" autocomplete="off" required>
       </div>
       <div class="form-group">
         <label for="mail_use_ssl">{{_('Encryption')}}</label>
@@ -50,7 +50,7 @@
       </div>
       <div class="form-group">
         <label for="mail_from">{{_('From E-mail')}}</label>
-        <input type="text" class="form-control" name="mail_from" id="mail_from" value="{{content.mail_from}}">
+        <input type="text" class="form-control" name="mail_from" id="mail_from" value="{{content.mail_from}}" required>
       </div>
       <label for="mail_size">{{_('Attachment Size Limit')}}</label>
        <div class="form-group input-group">