Converted to Mvc application
Merge branch 'master' into deploy

Conflicts:
	web.config