Merge branch 'next' into api
merged next
Merge branch 'api' of https://github.com/maidsafe/MaidSafe into api