增加upload功能
增加upload.js
增加upload功能
增加加密解密模块用来处理账号密码本地存储
Merge branch 'master' of https://github.com/squarepants/BS

Conflicts:
	bs.conf