Merge branch 'develop' of https://github.com/guokr/simbase into develop

Conflicts:
	src/tests/java/com/guokr/simbase/TestableCallback.java
Merge branch 'develop' of github.com:zjjott/simbase into develop
delete .orig file

Signed-off-by: zjjott <zjjott@126.com>