Giving user_model insert enrty, update entry, find_entry
Merge branch 'dev_croftp2'

Conflicts:
	application/models/user_model.php
Merge branch 'master' of github.com:gattazr/Folio

Conflicts:
	application/models/user_model.php