Merging unstable into unstable20_iOS, updating versions

There were some versions in the original unstable20_iOS that were still pointing at 1.5.  Updated them all to point to 2.0.