Merge branch 'master' into depfu/update/front-end/npm/cordova-plugin-ionic-keyboard-2.2.0

Author: guibranco