hehe
Merge branch 'master' of github.com:hanyuwei70/fasttrans

Conflicts:
	sess.cpp