改寫service::service_list

Conflicts:
	service.php
Merge branch 'master2' into newtinymce