a
Merge branch 'master' of https://github.com/DoronVaknin/Maestro

Conflicts:
	ProjectDetails.aspx