Merge origin/master

Conflicts:
	src/java/Interface/ApRest.java
Merge origin/master