quick commit
Merge remote-tracking branch 'origin/master'
profile page fixed, added comment and attendees button
Merge remote-tracking branch 'origin/master'