list mapping toko
Merge branch 'master' of https://github.com/dokuku/Bina-Citra-HeadOffice

Conflicts:
	binacitra.headoffice.web/Modules/AssetsModule.cs
	binacitra.headoffice.web/Views/TestUI/MappingToko.cshtml
	binacitra.headoffice.web/binacitra.headoffice.web.csproj
pull
Merge branch 'master' of https://github.com/dokuku/Bina-Citra-HeadOffice

Conflicts:
	binacitra.headoffice.web/Modules/AssetsModule.cs
	binacitra.headoffice.web/Scripts/app/mappingtoko/main.js
	binacitra.headoffice.web/Views/TestUI/MappingToko.cshtml
	binacitra.headoffice.web/binacitra.headoffice.web.csproj
pull
Merge branch 'master' of https://github.com/dokuku/Bina-Citra-HeadOffice

Conflicts:
	binacitra.headoffice.sln
	binacitra.headoffice.web/Views/TestUI/MappingToko.cshtml
	binacitra.headoffice.web/binacitra.headoffice.web.csproj
list mapping toko