IOS IAP 13/07/09
Merge branch 'IOS'
Merge branch 'Android'
Merge branch 'master' into Android