finish add and search Distributor
Merge branch 'master' of https://github.com/ludwiksh/Marksimos

Conflicts:
	public/app/js/appadmin.js
	public/app/js/websitecomponent/menuadmin.html
	views/admin/adminhome.ejs