Merge pull request #1 from ttatarinov/master

Sync with main repo
Changed config.xml path to prevent conflicts with other plugins.
Merge pull request #2 from hukal/master

Fixed conflict with other plugins on android