tmp commit
Merge remote-tracking branch 'origin/freelancer' into freelancer

Conflicts:
	module/Admin/view/admin/freelancer/index.phtml
	module/Admin/view/admin/freelancer/view.phtml
	public/js/admin/freelancer/index.js