Massive rework
Merge branch 'HEAD' of git@github.com:Dykam/Nano.git

Conflicts:
	Nano/Nano/Entities/PlayerEntity.cs