Merge remote-tracking branch 'origin/master'

Conflicts:
	StarcraftBuildOrderApp/Program.cs