Merge branch 'sitrep' into 'master'

Adds markings for refactoration and editorconfig

See merge request lappis-unb/projects/SMI-UnB!7
2 jobs for master in 2 minutes and 25 seconds (queued for 14 seconds)
Status Job ID Name Coverage
  Test
passed #109256783
stylesheet

00:01:57

passed #109256782
test

00:02:25