Copy Files for edit

Waiting for constructors, destructors to be written
Merge remote-tracking branch 'origin/master'

Conflicts:
	xiaotian/GemPuzzle_XTZ/Game.cpp
	xiaotian/GemPuzzle_XTZ/GemPuzzle_XTZ.depend
	xiaotian/GemPuzzle_XTZ/GemPuzzle_XTZ.layout