app.js changes
Merge branch 'master' of https://github.com/moreishi/ionic-protoapp