Merged branch master into gtr
Removed spade.png