working on something
Merge pull request #55 from Konviser/master

Implementation of editing event functionality
fixed showing username if picture is not showing
Merge pull request #56 from naisnouk/master

fixed showing username if picture is not showing
bug on Edit profile
Merge remote-tracking branch 'upstream/master' into working