Merge branch 'update_icon'
Merge branch 'new_init_file'
Fix QBasicTimer usage for creating animations
Fix canvas shutdown calls
Merge remote-tracking branch 'devel/51-ben-animation-fixes' into devel-master