asd
Merge branch 'master' of https://github.com/smokevision/MamkTilanvaraus

Conflicts:
	MamkTilanvaraus/nbproject/private/private.xml