C'Est de la sauce
Merge remote-tracking branch 'remotes/origin/Version_0_1' into Version_0_1

Conflicts:
	educatus/src/educatus/client/presenter/SeminaryEditPresenter.java