之前提交时出现了很多混乱，整理后重新提交
继续解决麻烦

Merge branch 'master' of https://github.com/phisiart/ds15gl

Conflicts:
	ds15gl/dsTools.cpp