Fixed add/edit buttons for different user profiles.
Fixed user profile image display.
Merge branch 'master' of https://github.com/rommen/octagon