.
Merge branch 'master' of https://github.com/BinaCitra/Bina-Citra-HeadOffice

Conflicts:
	binacitra.headoffice.web/Scripts/app/mappingtoko/views/Toolbar.js
Merge branch 'master' of https://github.com/BinaCitra/Bina-Citra-HeadOffice