fixed post bug
adding sunshine to friend page
resolving merge conflict friendjs