Merge branch 'next' of github.com:maidsafe/MaidSafe-Vault into next

Conflicts:
	src/maidsafe/vault/maid_manager/helpers.h
removing unnecessary file
Merge branch 'vault' into vault_cache

Conflicts:
	src/maidsafe/vault/cache_handler/service.h
Merge branch 'vault_cache' into vault