Merge origin/master

Conflicts:
	src/main/java/util/JavaUtil.java
Merge origin/master