view conflict
again view conflict

Conflicts:
	application/controllers/view.php