first two checklist items, close alerts, and change More button text
Merge branch 'master' into minor-ui-nits-feb8
Total Votes box flush right on mainContent
update TotalVotes block text
change post submit modal hub message text
reconciling this branch with PR-97
Forgot password email format improvements and correct attachment of support@spokenvote.org to the system  "from" address.
Merge remote-tracking branch 'upstream/master'
User avatar
fix remainder of merge conflicts
Merge pull request #101 from billsaysthis/minor-ui-nits-feb8

Minor UI Nits
Now storing Active/New/My Votes in the session. Search form partial changed to get the search hub so controllers don't have to, enabling the search form to be prepopulated everywhere.

Conflicts:
	app/controllers/proposals_controller.rb
	app/views/shared/_proposals_table.html.haml
Merge pull request #103 from calasyr/search-and-filter-part2-Feb09

Part 2 of storing both search hub and button status in the session and using it everywhere
hub modal properly launched, gets both group name and location values if available
updating a bunch of gems
put back changes that got overwritten on a timing issue
fix text of Make It link
fix make proposal link for not loged in users
Merge pull request #102 from Vibhuti/master

User avatar support
Merge pull request #105 from billsaysthis/update-gems-feb9

updating a bunch of gems