add group support
Merge branch 'master' of
https://github.com/alexxiyang/form-sql-builder-mysql.git

Conflicts:
	src/main/java/org/crazycake/formSqlBuilder/FormSqlBuilder.java
	src/main/java/org/crazycake/formSqlBuilder/SqlGenerator.java
	src/main/java/org/crazycake/formSqlBuilder/model/Rule.java
	src/main/java/org/crazycake/formSqlBuilder/utils/PropertiesUtils.java
	src/test/java/org/crazycake/formSqlBuilder/SqlGeneratorTest.java
	src/test/java/org/crazycake/formSqlBuilder/testvo/Person.java
	src/test/java/org/crazycake/formSqlBuilder/utils/PropertiesUtilsTest.java
	src/test/resources/formSqlRules/groupSearch.json