基本功能实现
Merge branch 'master' of github.com:feixiang/ionicApp