Master

Sorry this accumulated a little. I had initially merged in mrcheko's changes since there was quite some conflict potential. In the end I reverted the merge since he added more commits to the PR that aren't quite ready yet. 

Change highlights:
 - Creature with weapons/shields
 - Area magic
 - Melee blocking
 - Spawn levelled creatures