Merge pull request #8 from cboulanger/master

Update TokenField contribution Manifest
add trunk version again in order to not break apps depending on it
add link to contrib catalog website
moved obsolete Simulator contrib into legacy dir
updated the manifest
updated the manifest for Aristo
added ServerObjects back into list of contribs
Merge pull request #9 from johnspackman/master

updated the manifest for UploadMgr
Updated dialog contrib to v1.1
Updated TokenField's qooxdoo-version info