Merge pull request #2 from OtherBrother/develop

Test-Release
Merge branch 'release/pianoman-d'
Fixed ammo form
Merge branch 'hotfix/12-13' into develop