...
Merge branch 'markup' of https://github.com/tmn-tsogu-team/panda into markup

Conflicts:
	PandaDataAccessLayer/MainInitializer.cs
	PandaWebApp/Views/Promouter/Edit.cshtml
...