Minor documentation to DataUpgradeListener
Don't loose the user when merging data
Fix a few warnings/TODOs
Fix Javascript syntax