removed reconnect feature - in release branch only
Merge branch 'master' into release
Merge branch 'release' of https://github.com/coyotte508/pokemon-online into reborn
Add Battle Logs plugin
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'release' of https://github.com/coyotte508/pokemon-online into reborn
Merge release
Use HTML instead of POreplay for Battle Logs
Custom Stats Extractor
Merge branch 'master' into release
Merge branch 'release' of https://github.com/coyotte508/pokemon-online into reborn
Merge upstream
Fix compile issue
Fixed Beat Up
Merge branch 'master' into release

Conflicts:
	src/Teambuilder/client.cpp
Pre-update
Merge
Pre-merge
Merge branch 'master' of https://github.com/coyotte508/pokemon-online into release