Angelbane can cancel angels, and the bonus damage it deals relates to the defender's alignment
Merge branch 'develop' of http://github.com/BarclayII/slashem-up into develop

Conflicts:
	include/artilist.h
	src/apply.c
	src/artifact.c