...
Merge branch 'compound-xaction'

Conflicts:
	src/org/xmodel/xaction/CompoundAction.java
	src/org/xmodel/xaction/IfAction.java
	src/org/xmodel/xaction/ScriptAction.java
	src/org/xmodel/xaction/TryAction.java
Merge branch 'master' into rabbitmq-simpler