merge
Merge branch 'master' of https://github.com/snowiow/SEP

Conflicts:
	Zuul.Gui/Properties/Resources.Designer.cs
	Zuul.Gui/Properties/Resources.resx