ignore derby.log
Merge branch 'master' of https://github.com/mybatis/mybatis-3.git
Fixes #277. Fix stored procedure snippet.
Updated mockito in pom.xml