Alternative GCC compile fixes.
Merge branch 'next' of github.com:maidsafe/MaidSafe-Drive into next

Conflicts:
	include/maidsafe/drive/root_handler.h