I removed the functions MAX and MIN, because they already exist

as max() and min() in the standard library (#include <algorithm>).
Since I don't have Albert I can't test everything.  I apologize
if I broke something.

[[Imported from SVN: r318]]