1
Merge branch 'master' of https://github.com/sx1989827/teambition

Conflicts:
	code/1.0/Core/Core/main.cpp