Merge remote-tracking branch 'origin/master'

Conflicts:
	Magicnation/com/juanwan11_magicnation/blocks/GemStoneBloodBlock.java

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.history/75/80426e67cd6d00141c97977bf96c427d