Fixes
Merge branch 'master' of https://github.com/tmn-tsogu-team/panda

Conflicts:
	PandaWebApp/Views/Promouter/Detail.cshtml