Trying to fix crash
Merge branch 'master' of https://github.com/poloure/drunken-archer
Bug fixed manage screen.
Merge branch 'master' of https://github.com/poloure/drunken-archer
Merge pull request #30 from Currfyg/master

Merge