Merge branch 'master' of https://github.com/yambal/Hello-Cordova.git
into gcm