refactoring of upload. fix for #30
Merge branch 'master' of github.com:enviroCar/enviroCar-app

Conflicts:
	org.envirocar.app/src/org/envirocar/app/application/UploadManager.java