bug fix
Merge branch 'master' of github.com:longruiliu/ECR

Conflicts:
	ForeEnd/messagelistener.cpp