Merge branch 'marmalade_iaphelper'

Fixed everything from previous pull request. Removed changes of the OpenIAB classes.