Update
Merge branch 'NeonStar' of github.com:LitchiSzu/NeonEngine into NeonStar

Conflicts:
	NeonStar/NeonStar/out/Data/Config/DevicesSaveTemplate.xml