first tests in MensaActivityTest
merge conflicts resolved
project.properties restored, to work with jenkins,