Merge remote-tracking branch 'origin/Front'

Conflicts:
	EvernestFront/EvernestFront/Stream.cs