BUGFIX fixed uploading files
TEMPORARY BUGFIX reduced the number of parallel asynctasks to avoid
RejectedExecutionException
BUGFIX updated the port of the Telecom Italia server
FEATURE improved merge dialog