Merge origin/master

Conflicts:
	src/givem/Givem.java