Test commit pushing front end changes
Merge branch 'master' of https://github.com/mirhagk/SPAupdater

Conflicts:
	Examples/MailApp/MailApp/index.html
	UpdateServer/UpdateServer/UpdateServer.njsproj