Updated Boost to version 1.57.0.
Minor fixes to handle updates to OS X version 10.10, CMake Version 3.1 and Boost version 1.57.
Added CMake option to include test targets.
Further updates to exclude tests if required.
Another update in preparation for CMake 3.1.
Merge pull request #170 from Fraser999/MAID-457

Minor fixes to handle updates to OS X version 10.10, CMake Version 3.1 a...
Merge pull request #171 from Fraser999/MAID-460

Added CMake option to include test targets.
Updated CMake if statements in line with CMake v3.1 policy.
Bugfix in add_gtests CMake module.
Merge pull request #173 from Fraser999/MAID-500

Updated CMake if statements in line with CMake v3.1 policy.
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 remote-tracking branch 'origin/next' into MAID-432_boost_1_57

Conflicts:
	cmake_modules/add_boost.cmake
Merge remote-tracking branch 'upstream/next' into MAID-432_boost_1_57
Merge pull request #169 from Fraser999/MAID-432_boost_1_57

Updated Boost to version 1.57.0.
Merge remote-tracking branch 'origin/next' into android_setup

Conflicts:
	CMakeLists.txt
	cmake_modules/add_boost.cmake