2
Merge branch 'master' of github.com:kun1994/bbs

Conflicts:
	Application/Runtime/Logs/14_12_17.log
3