Merge branch 'integration-1st-round' of https://code.ac.upc.edu/projects/IOlanes/ubuntu-lucid.git into IOAnalyzer