fixed order_settle.html 提交订单按钮 and changed 添加新地址按钮

修复了提交订单按钮显示不全和把添加新地址按钮改小了
Merge branch 'dev' of github.com:onecampus/wine into dev
Add blockUI to display flash msg.
Fix login register page.
Fix nav bar henght.
Merge branch 'yang' into dev
Merge branch 'dev'