update
Merge branch 'master' of github.com:VisualRun/yii-ace

Conflicts:
	protected/controllers/TaskController.php
	protected/models/Task.php
	protected/views/admin/point.php
	protected/views/task/add.php
test