pull commit
stages
Merge branch 'origin/develop'

Conflicts:
	protected/views/project/view.php