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

Conflicts:
	ProjectInformation.aspx.cs
	javascript/Maestro.js