adding a uploader file
Merge branch 'origin/master-3'

Conflicts:
	src/fr/enst/pact43/ft/RegisterActivity.java