Spiketrap
Merge branch 'master' into Ameroz

Conflicts:
	The Seekers Way 0.2/Shield.cpp
Spiketrap
Fireball/FireRune/Spiketrap