commit merge
Merge branch 'master' of https://github.com/CKovacs/JnRProject

Conflicts:
	JnR/Assets/3D Stuff/Edited_PropsAnimation.meta