begin of reminder development
Merge branch 'master' of https://github.com/ACPLMaverick/marjan

Conflicts:
	Kompo/Kino/src/mainPackage/Controller/Controller.java