fixed merge conflicts
fixed merge conflicts

Postmedia-Digital/cordova-google-adwords,Postmedia-Digital/cordova-google-adwords,Postmedia-Digital/cordova-google-adwords,Postmedia-Digital/cordova-google-adwords,Postmedia-Digital/cordova-google-adwords