Fix a possible memory leak
Merge pull request #431 from leeroy2098/merge

Fix a possible memory leak
Update readme to reflect site repo move
How did I manage to fuck this up?
Merge pull request #432 from stal888/patch-2

Update readme to reflect site repo move
Fixed warnings on Windows
Merge pull request #433 from nurupo/master

Fixed warnings on Windows
Replaced friendstatus with connectionstatus
Merge pull request #434 from nurupo/master

Replaced friendstatus with connectionstatus
Fixed a typo
Fixed a mistake
Merge pull request #435 from nurupo/master

Fixes of my previous pull request
Send our current status and name to friend that just came online.
Our username and status might have changed while our friend was offline.
Merge pull request #436 from Alek900/master

Send our current status and name to friend that just came online.
Implemented Deadline Timer and timer_test
Added LAN discovery timer
Merge branch 'timer'

Conflicts:
	core/CMakeLists.txt