init -
Merge branch 'dev' of https://github.com/ScanTechMedia/YoTe-core into dev

Conflicts:
	.gitignore