merge
fix conflicts
Merge branch 'workshop' of github.com:MrKepzie/Natron into workshop
Another bug fix in restore serialization