ooooorka
Merge branch 'master' of https://github.com/wisingd/Dajoroli

Conflicts:

Workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	Workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
mmm