合并周俊的代码

合并周俊的代码
Merge branch 'master' of https://github.com/Fanty/bsl-client

Conflicts:
	platforms/ios/www/phone/js/main.js
合并周俊的代码

合并周俊的代码