12-9

1,修改了textfield在ios6中text显示问题
2，修改了一些bug
Merge branch 'master' of https://github.com/jijunyuan/OnSaleLocalLast