Compatibility with random() libraries (now everyone uses random() and RANDOM_MAX insead of rand() and RAND_MAX)
Merge remote-tracking branch 'bruno/master' into emerge

Conflicts:
	src/qualia/computer/random_shuffle.cpp
	src/qualia/util/random.h
- Fix for definition of random.h
- ifdef for header file.