Merge origin/master

Conflicts:
	src/java/entities/Assembler.java