commint session
Merge branch 'master' of github.com:fsiaonma/together

Conflicts:
	src/util/tool/tool.cpp
Merge branch 'master' of github.com:fsiaonma/together

Conflicts:
	src/util/tool/tool.cpp