忘记提交
Merge branch 'master' of git://github.com/avplayer/avrouter

Conflicts:
	src/login_moudle.cpp