Pixie Plate, Safety Goggles, Assault Vest
More item adjustments
Merge remote-tracking branch 'wavy/master'

Conflicts:
	src/Server/battle.cpp
Merge branch 'master' of github.com:po-devs/pokemon-online