Merge remote-tracking branch 'upstream/next' into next
Merge branch 'next' of github.com:Fraser999/MaidSafe-Routing into next
Merge remote-tracking branch 'upstream/next' into next
Changed CMake variable from MaidsafeTesting to INCLUDE_TESTS.
Remove MaidSafe office IP from hardcoded bootstrap endpoints in next
Merge pull request #60 from benjaminbollen/MAID-478_remove_office_IP

Remove MaidSafe office IP from hardcoded bootstrap endpoints in next
Merge remote-tracking branch 'upstream/next' into next
linking to protobuf directly
Merge pull request #52 from Fraser999/MAID-460

Maid 460
Merge remote-tracking branch 'upstream/next' into next
Minor update to CMakeLists.txt.
Merge pull request #63 from Fraser999/MAID-500

Minor update to CMakeLists.txt.
Merge pull request #61 from ustulation/MAID-485_protobuf_update

MAID-485: linking to protobuf directly
Merge branch 'next' of github.com:peersafe/MaidSafe-Routing into next