finish service prices tab
Merge remote-tracking branch 'origin/papertask-profile' into papertask-profile

Conflicts:
	master_data.sql
	module/Admin/view/admin/papertask/profile.phtml
	module/Api/config/module.config.php
	public/js/admin/papertask/profile.js