move voveri/ to resistance/
Merge remote-tracking branch 'remotes/grog/master' into actual-rules