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

Conflicts:
	src/maidsafe/vault/maid_manager/helpers.h