Merge origin/master

Conflicts:
	src/main/java/org/peasant/util/BasicFileRepository.java
Merge origin/master