names branch commit
user can now enter the battle scene, various other menu fixes, cleaned up some global stuff