Revert "some class added"

This reverts commit 86a6c976d7f6294de7737c52d60a10b5d795dfb8.
Merge remote-tracking branch 'origin/master'

Conflicts:
	class/logic/basic.h
	class/logic/character.h
Merge branch 'master' of https://github.com/plusun/HearthStone-theMaster