small changes - git forced me (annoying)
Merge branch 'master' of https://github.com/DoronVaknin/Maestro

Conflicts:
	ProjectInformation.aspx.cs