Merge remote-tracking branch 'maidsafe/next' into address_allocation
Merge pull request #47 from dirvine/address_allocation

MAID-325-json-aware-address_space_tool
Merge remote-tracking branch 'maidsafe/next' into next