update WIP
Merge branch 'next' of github.com:maidsafe/MaidSafe-Drive into next
Merge branch 'next' into buffer_updates

Conflicts:
	CMakeLists.txt