2013-09-07 end of day.
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/models/Task.php
	protected/views/deal/_form.php
	protected/views/deal/index.php
	protected/views/task/_form.php