First version of Firefox addon
Merge new_upload with master