lisstener
Merge branch 'master' of https://github.com/GCVSoftwareEng/VokabeltrainerRepository

Conflicts:
	Vokabeltrainer/src/ch/gcv/vokabeltrainer/view/TopicEditView.java