Added mockito, removed *.jar from .gitignore
adjusted test .gitignore
updated .gitignore
merged .gitignore