update
update
Merge branch 'master' of
https://github.com/lunextelecom/event-processor-rule.git

Conflicts:
	src/main/java/com/lunex/ruleprocessor/App.java