Merge branch 'master' of github.com:aetheon/cordova-plugins
Merge branch 'master' of github.com:aetheon/cordova-plugins