refactor
Merge branch 'master' of git@github.com:tqlab/mybatis-plugin.git

Conflicts:
	src/main/java/com/tqlab/plugin/mybatis/generator/AnnotatedGenerator.java
	src/main/java/com/tqlab/plugin/mybatis/generator/SqlTempleatePluginAdapter.java
	src/main/java/com/tqlab/plugin/mybatis/util/ScriptUtil.java
	src/main/java/com/tqlab/plugin/mybatis/util/SelectAnnotationUtil.java
	src/test/java/org/mybatis/generator/maven/SqlTester.java