Changed connection string
Merge branch 'master' of https://github.com/fahslaj/maestro_2014

Conflicts:
	Maestro/Maestro.v11.suo