Added latest MoM
Merge remote-tracking branch 'remotes/origin/master' into db-hibernate2

Conflicts:
	Data/src/test/java/cz/cuni/mff/ufal/textan/data/test/ConcurrencyTest.java