Hybrid refresh/replay fixes
Merge pull request #784 from khawkins/hybrid_refresh

Hybrid refresh/replay fixes
Merge remote-tracking branch 'upstream/master' into unstable_merge

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

Merging master back to unstable