Added melee weapon editing
Merge branch 'master' of https://github.com/arktheoverlord/Minerva_Tester.git