properties completed
Merge branch 'master' of https://github.com/mhutter/vokabeltrainer.git

Conflicts:
	src/Vokabeltrainer_de.properties