Make changes on every model
Merge branch 'master' of github.com:gattazr/Folio
Fix parsing error
Add adding users
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
Added the ability for users to manually add projects from a form