Added downloadable content support
Refactoring
Workaround for non-consumables with downloadable content being restored twice (!?)
Added public property storeDownload and code refactoring.
Merge commit '009934b23349327fcc1157a185423ffd2435eb7b'