.
Merge origin/master

Conflicts:
	Latoma/src/de/felix_maurer/latoma/Latoma.java