bootstrap changes
removing bootstrap handling from vault manager (wip)
Merge branch 'next' of github.com:maidsafe/MaidSafe-Vault-Manager into next

Conflicts:
	src/maidsafe/vault_manager/dispatcher.cc
	src/maidsafe/vault_manager/tests/client_interface_test.cc
	src/maidsafe/vault_manager/tests/vault_manager_test.cc
	src/maidsafe/vault_manager/tools/actions/connect_to_vault_manager.cc
	src/maidsafe/vault_manager/utils.cc
	src/maidsafe/vault_manager/utils.h
	src/maidsafe/vault_manager/vault_manager.cc
	src/maidsafe/vault_manager/vault_manager.h
updated connect to existing network option.
Merge remote-tracking branch 'origin/next' into sqlite

Conflicts:
	include/maidsafe/vault_manager/vault_config.h
	src/maidsafe/vault_manager/dispatcher.cc
	src/maidsafe/vault_manager/interprocess_messages.proto
	src/maidsafe/vault_manager/tools/commands/choose_path_to_bootstrap.cc
	src/maidsafe/vault_manager/tools/commands/choose_test_root_dir.cc
	src/maidsafe/vault_manager/tools/local_network_controller.h
	src/maidsafe/vault_manager/utils.cc
	src/maidsafe/vault_manager/vault_config.cc
cleanup
updated test
Updated in line with new bootstrap file process.
Merge remote-tracking branch 'origin/next' into sqlite
linking local_network_controller with maidsafe_routing_test_helper
Merge remote-tracking branch 'origin/next' into sqlite