removes functionality not yet live message
adding simple format to volunteer ops
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
more work on feature for selecting categories
Resolve ambiguous cuke step match
Add failing scenario for editing categories
wip for category edit
Fix typos in udpate method of org controller
First pass at nested attributes for edit cats
adds simple formatting to volunteers and organisation descriptions
merges with upstream master
merges with staging
Make features pass
Refactor our starship operator for category_organisation model
Refactor category_organisation <=> to delegate to category <=>
psd images and google verify
Refactor logic out of controller into category model
Add back has_and_belongs_to_many in category model
Merge branch 'develop' of https://github.com/AgileVentures/LocalSupport into org_edit_categories