Restructuring the code to keep the boost stuff separate from the rest of the code
Merge branch 'master' of https://github.com/burundiocibu/bling

Conflicts:
	master_server.cpp