Merge origin/master

Conflicts:
	src/java/entities/access/impl/PeopleAccess.java
	src/java/entities/util/AccessFactory.java