update
Merge branch '1.1.x' of https://github.com/txteam/tx-parent.git into
1.1.x

Conflicts:
	tx-components/tx-component-rule/target/classes/META-INF/maven/com.tx/tx-component-rule/pom.properties
	tx-components/tx-component-workflow/target/classes/META-INF/maven/com.tx/tx-component-workflow/pom.properties