removed timer hack. Fixed #1. Changed the event name: 'fileUploaded'.
merged conflicts