Phase2/master
Hello Marco, I think it is good to stay up to date with phase2/master, but I don't want to bother you with unwanted changes while you are busy, so I let you hit the merge button. There are a lot of changes, but it is mostly about adding strips and felix (from phase1/master). Phase2 code is barely touched by this merge. Regards, Frans