beta 3 (#3780)

* merge master - allow to upload twig invoice templates via UI
* support adding existing teams with same name
* permissions cannot be set right after role was created - fixes #3777
* allow to deactivate unique customer number validation - fixes #3762 
* invalid message when trying to edit locked or exported timesheets in calendar - fixes #3766
* updated icons and manifest - fixes #3761

templates/invoice/document_upload.html.twig

@@ -8,13 +8,17 @@
             {% block box_title %}
                 {{ 'upload'|trans }}
             {% endblock %}
-            {% block box_body %}
+            {% block box_before %}
                 {{ form_start(form) }}
+            {% endblock %}
+            {% block box_after %}
+                {{ form_end(form) }}
+            {% endblock %}
+            {% block box_body %}
                 {{ form_row(form.document) }}
                 <p>
                 <a href="https://github.com/kimai/invoice-templates" target="_blank">{{ 'download_invoice_renderer'|trans({}, 'invoice-renderer') }}</a>
                 </p>
-                {{ form_end(form) }}
             {% endblock %}
             {% block box_footer %}
                 <button type="submit" class="btn btn-primary">{{ 'action.save'|trans }}</button>