Merge
Merge branch 'master' of https://github.com/8thavenger/Battletech

Conflicts:
	Battletech.SQL/MySqlDataSource.cs