Ben des trucs
Merge remote-tracking branch 'remotes/origin/Version_0_1' into Version_0_1

Conflicts:
	educatus/test/educatus/SearchManagerTest.java