Create profile view using database
Merge branch 'master' into devRemi
Fix no project error
Merge branch 'master' of github.com:gattazr/Folio into devRemi

Conflicts:
	application/views/profile.php
Update function create / update / delete of models
Merge branch 'master' of github.com:gattazr/Folio
Initial commit for category database tools
Merge branch 'dev_croftp2'
Initial commit for the search page. Can see categories from an actual database
Make changes on every model
Merge branch 'master' of github.com:gattazr/Folio
Fix parsing error
updates to the search page to display images and names from the database
Merge branch 'devJ'

Conflicts:
	application/controllers/user.php
Merge branch 'dev_croftp2'
fixed main project owner member
Merge branch 'devD'
Fix link errors
Fix link problem 2
Fix db new user error
Add project routes