The conflicting code while merging Elisa Danielles branch in file
TestUiFrame.java pasted at the end of the file commented out. The code
at the top of the file corresponds to the version in Elisa Danielles
branch.

Merge of Elisa branch.