string imageSource to ImageSource source

+ add editions to timer
Merge branch 'master'