Merge remote-tracking branch 'project-template/master' into update-project-template

.clang-format

@@ -47,14 +47,30 @@ Language: Cpp
 MaxEmptyLinesToKeep: '1'
 NamespaceIndentation: All
 PenaltyBreakBeforeFirstCallParameter: '1000'
-PenaltyBreakComment: '1'
+PenaltyBreakComment: '10000'
 PenaltyBreakFirstLessLess: '1000'
 PenaltyBreakString: '10000'
 PenaltyExcessCharacter: '700'
 PenaltyReturnTypeOnItsOwnLine: '500'
 PointerAlignment: Left
 ReflowComments: 'true'
-SortIncludes: 'false'
+SortIncludes: 'CaseInsensitive'
+IncludeBlocks: 'Regroup'
+IncludeCategories:
+  - Regex:           '^<ChimeraTK/'
+    Priority:        2
+    SortPriority:    2
+    CaseSensitive:   true
+  - Regex:           '^<boost/'
+    Priority:        3
+    SortPriority:    3
+    CaseSensitive:   true
+  - Regex:           '<[[:alnum:].]+>'
+    Priority:        4
+    SortPriority:        4
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
 SortUsingDeclarations: 'false'
 SpaceAfterCStyleCast: 'false'
 SpaceAfterTemplateKeyword: 'false'
@@ -66,5 +82,5 @@ SpacesInCStyleCastParentheses: 'false'
 SpacesInContainerLiterals: 'true'
 SpacesInParentheses: 'false'
 SpacesInSquareBrackets: 'false'
-Standard: Cpp11
+Standard: c++17
 UseTab: Never