add: server
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hardware/core/Core.py