push a build
Merge branch 'master' of https://github.com/slayer12135293/projectmanager
Merge branch 'master' into leisbranch

Conflicts:
	ProductManager/ProductManager.Web/Controllers/ProductController.cs