project minor changes
Merge branch 'origin/master'

Conflicts:
	app/views/project/list.php