Updated versions and sources for tonttu site.
Fixed conflict