合并飞行移动的代码
Merge branch 'master' of https://github.com/fywb251/bsl-client

Conflicts:
	platforms/ios/bsl copy3-Info.plist
	platforms/ios/www/phone/css/main.css
	platforms/ios/www/phone/index.html
	platforms/ios/www/phone/js/main.js
合并代码