Added setting 'allow-waring-clans-into-protections' to be able to toggle allowing waring clans into each otehr's protections
Merge remote-tracking branch 'origin/master'