Cmake 3.0 fix

Moved add_subdirectory to after if statement
Merge pull request #174 from rossmuir/MAID-511_Cmake_3_fix

Cmake 3.0 fix
Merge branch 'next' of https://github.com/maidsafe/MaidSafe into next
Merge remote-tracking branch 'origin/next' into next_ned14