Added /give
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/lang/lang_en-gb.properties