Merge branch 'demo' into next
Merge branch 'next' of github.com:maidsafe/MaidSafe-Drive into next
Style fixes.