Merge branch 'master' of https://github.com/maxuna/GerdasSyhorna

Conflicts:
	GerdasSyhorna/FormEmployee.Designer.cs
	GerdasSyhorna/FormEmployee.cs
	GerdasSyhorna/FormOrders.Designer.cs