fixed a small bug and tried to find the reason for the userBrickBug
removed the UiTest paths/settings, because this folder doesn't exist in
master
added the .classpath files
deleted checkstyle.xml, because I could not switch branch
added checkstyle.xml again
merged with current master again, there were a lot of new changes..
merged CucumberTest
trying to rebase with master
trying to merge with master
merged userbricks-2013to2104 with current master