Tagging 2.5.0rc1.  Updating files
Setting to turn off Online Storage
Merge branch 'next'
Apparently the JS was wrong when tagging
Updating the JS for 2.5.0rc1
Merge branch 'next'
[CB-2518] Enable Geolocation in InAppBrowser
[CB-2504] Allow the disabling of overscroll glow.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
CB-2504: Merged overscroll disallowance, needed to deal with merge conflict with the InAppStorage toggle
[CB-1933] Changed button labels to an array.

This allows commas to be included in button label text.