v1.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	scrm/target/m2e-wtp/web-resources/META-INF/maven/org.jeecgframework/jeecg/pom.properties
v2