Merge memory/master

Conflicts:
	src/memory/Memory.java