added a portfolio view partial
fixed follower/followee image and added to portfolio layouts
resolved git conflicts