Merge pull request #35 from elitenomad/federico

now it actually works (hope)
Added columns on the show page
Merge branch 'master' of https://github.com/elitenomad/expense_tracker
Merge pull request #36 from elitenomad/federico

Merge branch 'master' into federico
Commited Edited routes.rb
Merge branch 'master' into Pranava_Users
add regenerate portions when add new group memeber
fixed the edit page
Merge pull request #37 from elitenomad/Pranava_Users

Pranava users
small fix in show pages and add test button for settlement
Woot! got settlements working
when you click settle link on a group show page
balances are calculated, and settlement is initiated
it calcualates who needs to pay who and how much to pay
it is recorded in the settlements table
Merge pull request #38 from elitenomad/marcus

Woot! got settlements working
Added public_activity gem and fixed User addition to group
Merge branch 'master' into Pranava_Users
Merge pull request #39 from elitenomad/Pranava_Users

Pranava users
Fixed the group show page for user display
Merge branch 'master' into Pranava_Users
Added railsfactor
Merge pull request #40 from elitenomad/Pranava_Users

Pranava users
Updated Railsfactor to group production