commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	koier/bin/koier/ReserverKoie.class