Pause optimize.
Bugs resolved
Merge remote-tracking branch 'origin/test'

Conflicts:
	Tetris/base_shapes.cpp
	Tetris/base_shapes.h
	Tetris/one_block.cpp
	Tetris/one_block.h