Issue #1 upgrade corova plugins
fix merge conflict