Upating plugin with Android fix
Merge pull request #37 from khawkins/hybrid_refresh

Upating plugin with Android fix
Merge remote-tracking branch 'upstream/master' into unstable_merge

Conflicts:
	plugin.xml
	src/android/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/sfhybrid/SalesforceDroidGapActivity.java
Merge pull request #38 from khawkins/unstable_merge

Merging master back to unstable