new grfx , changed resource container
Merge mk into master