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
wrote cucumber features for profile privacy settings
planned out initial tests for editing profile privacy; added  Preview button to user edit view
added untracked files meant for previous commit
moved Preview button out of edit form and changed to link
added scenario for sad path user edit button on others profile
UserProfile: changing the Member since step
implemented initial public/private setting for user email
commented out pending step
UserProfile: changing the Member since step (refactored step)
tests pass but still need to refactor step for displaying email
refactored step for profile_privacy
lunch break commit, tests RED
cucumber feature for profile privacy GREEN, changed link in navbar for user accounts page
resolved cucumber and rspec test for profile_privacy feature