Merge remote-tracking branch 'origin/kristjan_development' into robin_development

Conflicts:
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/programmeerimise_projekt.iml
	.idea/vcs.xml