Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Merge branch 'master' of https://github.com/tansaku/LocalSupport
First failing cucumber step for category feature
Merge branch 'categories_feature' of github.com:mtc2013/LocalSupport into categories_feature
got basic category select form into index page, and tightened up feature
Merge branch 'master' of https://github.com/tansaku/LocalSupport
Failing build with passing spec for category filter scope but need to implement it in the model
First attempt at a spec for AR scope filter_by_category
developing the category model
Migrated db to include join table for orgs and categories driven by spec
Adding org changes
got habtm working for categories and organizations
reducing logo size and specifying that size in the header
merging header logo fix
Merge branch 'master' of https://github.com/tansaku/LocalSupport into mail_features