Adding all changes from local repository.
Merge branch 'master' into xirvik
Merge branch 'master' into xirvik
Merge branch 'master' into xirvik

Conflicts:
	src/download/download_main.cc
Merge branch 'master' into xirvik
Merge branch 'master' into xirvik
Merge branch 'master' into xirvik
Merge branch 'master' into xirvik
Merge branch 'master' into xirvik
Merge remote branch 'upstream/master' into xirvik
Merge branch 'master' into xirvik
Reverted to stable version number.
Put the minor version number the right place.
Merge branch 'master' into xirvik
Merge branch 'master' into xirvik
Merge branch 'master' into xirvik
Explicitly wake up the main thread when we've got finished hashes to process.
Merge branch 'master' into xirvik
Merge branch 'master' into xirvik
Merge branch 'master' into xirvik

Conflicts:
	src/data/hash_queue.cc
	src/data/hash_queue.h
	src/manager.cc
	test/data/hash_queue_test.cc