Merge remote-tracking branch 'origin/alex/dev'

Conflicts:
	Program.cs
	Properties/AssemblyInfo.cs