Some refactoring done
Merge branch 'master' into boost_malloc_to_new

Conflicts:
	proof_of_work/Server.h
	proof_of_work/main.h
Merge branch 'boost_malloc_to_new'

Conflicts:
	proof_of_work/main.cpp