Merge branch 'master' of D:\git\Puzzly with conflicts.
add FadeIn