Fixed add friend on users list and added cancel in modal for adding friend from user show page and removed back from login page
Merge branch 'master' of https://github.com/JuhaMikkola/fitbyfriday
Fixed issue after merge with user show page, removed double welcome message after making a new user