Jesper upload
Merge branch 'master' of https://github.com/Aasagi/LumberjackFantasies

Conflicts:
	Assets/Textures.meta
	Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll