Ignoring userprefs

Signed-off-by: Ante <ante.bralic@gmail.com>
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop
Adding new sixense.dll + ignore file update + meta files

Signed-off-by: Ante <ante.bralic@gmail.com>
Updated Sixense plugin + Hydra Mac fix

Signed-off-by: Ante <ante.bralic@gmail.com>
Merge branch 'develop' of https://github.com/Seurath/TOJam-8 into develop

Signed-off-by: Ante <ante.bralic@gmail.com>

Conflicts:
	.gitignore
	tojam/Assets/Fonts.meta
	tojam/Assets/Fonts/tr2n.meta
	tojam/Assets/Fonts/tr2n/License.txt.meta
	tojam/Assets/Fonts/tr2n/Readme.txt.meta
	tojam/Assets/Fonts/tr2n/TR2N-Sample.png.meta
	tojam/Assets/Fonts/tr2n/Tr2n.ttf.meta
	tojam/Assets/IK/Materials.meta
	tojam/Assets/IK/Materials/blue.mat.meta
	tojam/Assets/Textures/drone_texture_v1o.png.meta