web app 1
Merge branch 'master' of https://github.com/llagasc/TestRepoSln

Conflicts:
	WebApp1.Dev.Deploy/WebApp1.Dev.Deploy.wdproj