Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/opl/server/domain/Dependency.java
	src/main/java/com/opl/server/utils/DependencyUtils.java