Ingame graphics.
Merge branch 'master' into daniel