Test cases made by Vuk & Jakob (1c and 1d)
Merge origin/master

Conflicts:
	.gitignore
	nbproject/project.properties