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

Conflicts:
	protected/views/project/view.php