more work on uploader modules

rework the javascript loading, so hammer is loaded before Angular and everything still loads.