tmp commit
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
fix conflicts
test
Merge branch 'master' into freelancer
Fix freelancer finish registration bugs
hat fix some - need fix on function updateManyToOne()
fix freelancer update info
Merge branch 'fix-freelancer-finish-registration' into freelancer
finish freelancer child pages
Merge pull request #15 from papertask/freelancer

Freelancer
Merge branch 'master' into project-list

Conflicts:
	module/Admin/config/module.config.php
	module/Api/config/module.config.php