confirm before delete
Merge branch 'master' of https://github.com/YiiTeam/resource

Conflicts:
	protected/extensions/tablesorter/Sorter.php
Confirm to delete dialog
Merge branch 'master' of https://github.com/YiiTeam/resource

Conflicts:
	.gitignore
	protected/runtime/application.log