1.修改
Merge branch 'master' of https://github.com/zeroisstart/Pluto

Conflicts:
	js/tool.trigger/tables.options.js
	protected/modules/Content/controllers/ColorController.php

	protected/modules/Content/controllers/CommandsController.php
	protected/modules/Content/views/commands/