Fixed Connection strings
Merge branch 'master' of https://github.com/nicopretorius/DataCat

Conflicts:
	DataCat-Client.suo
	frmMain.cs