Merge origin/master

Conflicts:
	src/main/java/com/wittakarn/bpm/oracle/OracleBPMImpl.java