Fix bugs left after transition to 5.2
Merge origin from alexander-yakushev/Orglendar

Conflicts:
	orglendar.lua