rearranged gcm registration, added parameters to upload servlet to handle locations without files