old aux and log files
merge conflict solved
minor changes in the paper (correct link for Fig. 2, eliminate nocite to have links on the refs)