Fixed menu and fixed attackbutton(OutOfMemory)
Merge branch 'master' of https://github.com/PISProject/PISProject.git