Use QTimer to run instead of thread
Seem to have fixed animation save
Fixed merge issue
Merge branch '51-ben-animation-fixes' into devel