New version of GAE
Update mockito version