Improve documentation
Adding docs for when_some/wait_some, correcting other docs. Changing when_xxx_n functions to return a vector<future<T>> instead of a future<Iterator>.
Starting to remove merging_map
Fix runtime errors caused by recent changes
Removing util::merging_map from the server side as well.
Removing merging_map test
Fixing problems with HPX_PREFIX, this is related to #1252: HPX_PREFIX is too fragile
(cherry picked from commit 39f1382e005e37edfec38c7938f92286c31206e6)

Conflicts:
	src/hpx_init.cpp
Fixing current compilation problems
(cherry picked from commit 1829bef829a2ecc0323a50bef8c56b5994121835)

Conflicts:
	hpx/hpx_init_impl.hpp
	hpx/hpx_start_impl.hpp
srand() update

Conflicts:
	tests/unit/parallel/adjacentfind_binary.cpp
	tests/unit/parallel/copyif.cpp
change tab to space

Conflicts:
	tests/unit/parallel/adjacentfind.cpp
	tests/unit/parallel/adjacentfind_binary.cpp
test units updated with returned_from_algorithm

Conflicts:
	tests/unit/parallel/adjacentfind_binary.cpp
	tests/unit/parallel/foreach.cpp
	tests/unit/parallel/foreachn.cpp
indent inconsistency fix & command line option added in main()

Conflicts:
	tests/unit/parallel/adjacentfind.cpp
desc_commandline was added to HPX_TEST_EQ_MSG as an parameter for all test units
Fixing copy & paste error
Resolving merge conflicts
Fixing copyn_test
Fixing copyif test