Fixed the Max-Operator.
Merge branch 'master' of https://github.com/koradir/dmdb2014

Conflicts:
	src/ch/ethz/inf/dbproject/model/test/Part2Test.java