Small fixes
Merge branch 'master' of https://github.com/jaaplallie/MAPSS.git

Conflicts:
	MAPSS/APDescription.txt
	MAPSS/MTPs-Main-Container.txt
Jaaps version didn't work properly. I just tested and found out mine did.
Although our versions are very similar, I'm comitting whatever code I
have left to see if it can make a difference on jaap's pc.