,
Merge branch 'master' of github.com:igrir/Tanyoo

Conflicts:
	application/views/profile.php