Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into user-profile
to catchup with upstream additions
Merge branch 'user-profile' of https://github.com/PeteBoucher/WebsiteOne into user-profile
Merge branch 'user-profile' of https://github.com/PeteBoucher/WebsiteOne into user-profile
moved Joined on text below avatar
made user avatar 20% smaller
updated scenario with new profile page avatar size; added conditional to the related step so that we can be less precise about this in future
added scenario for sad path user edit button on others profile
UserProfile: changing the Member since step
commented out pending step
UserProfile: changing the Member since step (refactored step)
comment for pending step
failing test for time since singup
create a user profile page story - working on user member for tests
dropped cukes for Member for: time period on profile page; this is not a behaivior and passing specs are sufficient
precompiled assets for heroku
resolved merge conflict in user show view with code from the guys woring on private email story
Merge pull request #132 from PeteBoucher/user-profile

User profile page story 64809366p1
added slug command to travis and precompiled assets that are missing after Petes PR
recompited manifest file due to conflicts
Merge pull request #135 from tochman/fixes

Fixes