added spec for proposal improvement task
merged in bills latest changes
Merge remote-tracking branch 'upstream/master'
added testcase for branching
Replaced the location and group selectors with a single hub selector and moved it out of the vote object block, as hub id was moved to proposals table.
This seems to have been changed to handle an improvement to a proposal, not a new proposal.  A new proposal has no parent id.  Perhaps improvements should be handled in a separate controller?  In any case, commenting this because it is unused and makes creation of new proposals fail.
Changed to refer to group instead of the older term 'topic'
This seems to have been changed to handle an improvement to a proposal, not a new proposal.  A new proposal has no parent id.  Perhaps improvements should be handled in a separate controller?  In any case, commenting this because it is unused and makes creation of new proposals fail.
merged with upstream
Merge pull request #61 from philipppahl/master

only voters who haven't voted on the tree yet are considered in the db seed
fri work product: filter by group, group+location working mostly, not yet setting hub_filter value from session on load
styling for hub filter dropdown, more tweaking seeds
Rails panel gem, http://railscasts.com/episodes/402-better-errors-railspanel

Install the rails panel extension in google chrome to use it
Merged.
updating Devise per security warning
Merge pull request #63 from billsaysthis/update-devise-jan28

updating Devise per security warning
Merge pull request #62 from calasyr/master

Fixes New Proposal Creation
Merge branch 'master' of https://github.com/railsforcharity/spokenvote into hub-filter-js-jan25
Merge branch 'hub-filter-js-jan25' of github.com:billsaysthis/spokenvote into hub-filter-js-jan25
Removed class element that wasn't working and that probably shouldn't be the solution to the original problem.