Flash stuff.
Merge branch 'master' into thomas
.
Merge branch 'master' into thomas
Added flash, with animation.