merge master
Merge branch 'html' of github.com:songjiayang/bitwin
Merge pull request #114 from songjiayang/issue_104

Issue 104
添加体现操作
Merge branch 'master' of github.com:songjiayang/bitwin
添加启动初始化货币帐户
Merge pull request #115 from songjiayang/issue_104

下委托单
Merge pull request #116 from songjiayang/issue_104

rake assets:precompile
按照要求修改了注册页
修改个人中心的js
完善ip地址列表展示
更新了初始化账户的rake
完成基本资料的修改
完成安全设置页面调整
Merge remote-tracking branch 'origin/master' into issue_104
添加页面跳转的flash错误
Merge remote-tracking branch 'origin/master' into issue_104
交易
调整路由