tests
tests
tests
tests
dd
Merge branch 'master' of https://github.com/botzzz/sentinel

Conflicts:
	sentinelAPI/src/main/java/sentinel/context/SentinelExecutionContext.java
	sentinelAPI/target/classes/sentinel/context/SentinelExecutionContext.class
	sentinelClient/src/test/java/opl/sentinel/domain/SentinelContextDaoTest.java
	sentinelClient/target/m2e-wtp/web-resources/META-INF/maven/opl/sentinelClient/pom.properties