updates to the search page to display images and names from the database
Add adding users
Merge branch 'devJ'

Conflicts:
	application/controllers/user.php
Merge branch 'dev_croftp2'
fixed main project owner member
Merge branch 'devD'