update code
update code
update 20140904
Merge branch 'master' of github.com:7demo/yousiIpad