Changed to match updated AsioService.
Fix MSVC compiler error.
Merge branch 'next' into vault_network

Conflicts:
	src/maidsafe/vault/data_manager/service.cc
	src/maidsafe/vault/tests/vault_network.cc