updated inline with nfs change
Merge branch 'next' into nfs_change
minor fix.
Merge branch 'next' into api_change

Conflicts:
	include/maidsafe/session_handler.h