Directory fixed, profile features updated
Merge branch 'master' of github.com:kcjpop/emotionless

Conflicts:
	application/models/user_model.php