Merge origin/master

Conflicts:
	src/java/entities/AppUser.java
Merge origin/master