fixes
Merge branch 'master' into dev
fixes
fix
friendships
friends fixes
partially removed user_follows
added friendship mailer
show friends on profile page
friendship_mailer
code cleanup
friends fixes
fixes
small fix
modal + other fixes
javascript flash code
button text changed