properly reset qtips after canvas reset
Merge remote-tracking branch 'origin/modularization' into modularization