Merge remote-tracking branch 'devel/meryem_use_http' into devel-master

* devel/meryem_use_http:
  meryem use http protocol
Merge remote-tracking branch 'devel/129_fix_cmake_typos' into devel-master

Conflicts:
	CMake/dashboard/meryem.cmake
Merge remote-tracking branch 'devel/130_download_test_files' into devel-master
Merge remote-tracking branch 'devel/129_fix_cmake_typos' into devel-master

Conflicts:
	CMake/dashboard/meryem.cmake
Merge remote-tracking branch 'devel/130_download_test_files' into devel-master
Merge branch 'usage_logger' into devel
Merge branch 'setup_cdat_missing_path_apple' into devel
Merge branch 'usage_logger' into devel
Merge branch 'usage_logger' into devel
Merge branch 'update_andrew_dawson_repos' into devel
Merge branch 'usage_logger' into devel