Shelving Progress
Matching to iOS
Updating test and data.xml
Merge pull request #160 from tblackwe/master

Updating data.xml and wave 9 android