animated zoom
Merge branch 'xmlfix' into dev
Merge branch 'dev' into thomas