unnecesary imports
test moved to annotation package 
Merge branch 'master' of https://github.com/LanyonM/mybatis-spring.git