added spec for proposal improvement task
merged in bills latest changes
Merge remote-tracking branch 'upstream/master'
added testcase for branching
merged with upstream
Merge remote-tracking branch 'upstream/master'
uncommented tests in vote model spec
changing omniauth redirect to root
Added Active Admin
Merge pull request #126 from Vibhuti/omniauth_redirect

changing omniauth redirect to root
Merge pull request #127 from tispratik/feb15_active_admin

Added Active Admin
Kickoff migration to backbone
Some changes for Trello issue: Incorrect behavior on clicking user name of related proposal.
Merge remote-tracking branch 'upstream/master' into my-votes-feb14
Separated search method from code for index.  Created common methods for title and proposal list order.
Add Staging Environment Faker Gem
Removed  Faker Gem
Separated code for index and search actions, and moved many shared things into separate methods.  The before filter for the old method is removed. Changes for 'Incorrect behavior on clicking user name of related proposal.' implemented.
Merge pull request #131 from calasyr/my-votes-feb14

Changes for 'Incorrect behavior on clicking user name of related proposal.' implemented.
Merge remote-tracking branch 'origin/master'