close #47
Merge pull request #48 from it3s/user-do-not-follow-himself

close #47
Merge branch 'master' into maps
Merge branch 'maps' into views-with-partials

Conflicts:
	app/helpers/users_helper.rb