newbrach dev

Signed-off-by: Andreas Larsen <northcode.no@gmail.com>
Merge branch 'master' of https://github.com/Jenjen1324/MCM-v3 into dev
Merge branch 'dev-jens' into dev
Merge branch 'dev-jens' into dev
Merge branch 'dev' into dev-jens