Fix includes of QtConcurrentMap
 fix conflicts
Merge branch 'workshop' of https://github.com/MrKepzie/Natron into workshop
Merge branch 'workshop' of https://github.com/MrKepzie/Natron into workshop
Fix conflicts