Added buffs to the client
Merge branch 'master' of github.com:freundlich/sanguis

Conflicts:
	src/client/draw2d/entities/enemy.cpp
Added buffs to friends as well