Added missing French move translations
Merge pull request #786 from turbedi/patch-1

Added missing French move translations
More accurate and easier to understand description for Camouflage
Merge pull request #787 from WriggleNightbug/patch-1

More accurate and easier to understand description for Camouflage
fix parental bond
Merge branch 'master' of github.com:po-devs/pokemon-online
Fix a typo
Merge pull request #790 from WriggleNightbug/patch-1

Fix a typo
Rawr typo
Various typo and description fixes
Sticky Web+Defiant/competitive/mist/flower veil
Descriptions for new berrie
Merge pull request #792 from CrystalMoogle/gen6data

Camouflage and terrain
Merge pull request #793 from CrystalMoogle/defiant

Sticky Web+Defiant/competitive/mist/flower veil
Merge pull request #791 from WriggleNightbug/patch-2

Rawr typo
Change ways players in channel are stored

This will detect more errors, and shut down the server as soon as one happens
Merge branch 'master' of github.com:po-devs/pokemon-online
Starting work on separating battles from the server

Starting work on issue #789
Probably fixed #203 for server plugins, but need to test if it works
Update proxydatacontainer.h
Merge pull request #796 from ROMaster2/patch-1

Update proxydatacontainer.h