Update proxydatacontainer.h
Merge pull request #796 from ROMaster2/patch-1

Update proxydatacontainer.h
Add hidden ability of Skrelp - Adaptability
Merge pull request #797 from turbedi/patch-1

Add hidden ability of Skrelp - Adaptability
Merge branch 'master' into battles