Merge branch 'andreas' into mikkel_restruct
Small changes
marker animation working
marker working!
isallowedtocync flag and marker corrections
merged mikkel
merged mikkel