Now maps attacks from json and automatically computers the modifiers for the attacks.
+More fixes and clean-up.
Merge remote-tracking branch 'origin/master'