Artwork changes. Refactoring
Merge branch 'master' of git://git.assembla.com/fakesmc