Merge remote-tracking branch 'refs/remotes/origin/master' into gh-pages
fixed android emulator issues with cordova.js file
DS Store
Merge remote-tracking branch 'refs/remotes/origin/gh-pages'