Merge pull request #2 from Morgul/master

Ease of use fixes
Merge pull request #5 from Morgul/master

Fix for #1: rebar generate fails due to circular symlink.
Added delete button for combatants.