updates
Merge branch 'master' of https://github.com/CarlTaylor1989/okteemo

Conflicts:
	application/views/profile/name.php