20140808-临时提交
Merge branch 'master' of https://github.com/TYD-QKJ/qkjebiz.git