...
Merge branch 'master' of github.com:hustruan/Queen

Conflicts:
	Queen/Queen/FrameBuffer.cpp
....