Updated
Merge remote-tracking branch 'remotes/github/master'

Conflicts:
	Makefile
	constants.cpp
	constants.h
	launcher.cpp
	namebreak.cpp
	namebreak.h
	network.cpp
	network.h
	utils.cpp