after merge
updates to join user
Merge branch 'master' of https://github.com/BPenkala/hoatzinest

Conflicts:
	application/views/project.php