got mbgs and cals uploading to the rest api
fixed minor merge conflit in Uploader.java