Merge branch 'hotfix-2.1.1' into develop
Merge branch 'hotfix-2.1.2' into develop
Merge branch 'hotfix-2.1.3' into develop
Trailing ":" removed from title page template
Typographic errors fixed in automation page
Merge branch 'master' of https://github.com/MISP/MISP into develop
Merge branch 'hotfix-2.1.4' into develop
Merge branch 'hotfix-2.1.5' into develop
Changes to the initial distribution settings

- The initial attribute distribution level now allows the option for 'event', inheriting the event's distribution level
Merge branch 'hotfix-2.1.6'