Merge branch 'master' into develop

Conflicts:
	src/main/java/com/hotmail/wolfiemario/rebalancevillagers/RebalanceVillagers.java