Merge pull request #129 from blackshadowshade/nonunique

Fixed button names to ensure uniqueness
Merge pull request #130 from blackshadowshade/trip

Added trip attacks
* modify columns of overview table (Fixes #80)
Merge pull request #131 from cgolubi1/tkt-80

* modify columns of overview table (Fixes #80)
Merge remote-tracking branch 'upstream/master' into swing_visibility