merged with develop
merged with develop

June92/Cardshifter,SirPython/Cardshifter,SirPython/Cardshifter,SirPython/Cardshifter,June92/Cardshifter,Cardshifter/Cardshifter,Cardshifter/Cardshifter,Cardshifter/Cardshifter,June92/Cardshifter