Fix some indentation
Moved BlockedBuffs check down for spell effects
Merge branch 'master' of github.com:KayenEQ/Server into KayenEQ-master

Conflicts:
	changelog.txt