-- add ignore fore Workspace.xml
Merge branch 'master' into mikitas_branch

Conflicts:
	.idea/workspace.xml