UlisesMapAndroidClient/tests/org/escoladeltreball/ulisesmap/connections/ClientLogginTest.java
solution conflict