Fix deprecation warning regarding Cordova 4.0
Merge branch 'fix-cordova-4' into develop