Fix recurrence of issue with OAuth dialog dismissal
Fix app upgrade from 3.0 and 3.1
Revert OAuth change
Merge pull request #61 from Esri/zwaap/Issue51_UpgradeBounceback

Fix upgrade from versions 3.0 and 3.1