add regenerate portions when add new group memeber
small fix in show pages and add test button for settlement
add test to settle the group and release when users confirm payments
duplication button works
it uses a form with hidden fields, then posts directly to create
needs more work to prefill new form
fixed bug on expense detail page when user has no portion
Merge branch 'master' into marcus
Merge branch 'master' into federico

merged manually conflicts
Conflicts:
	app/controllers/memberships_controller.rb
	app/controllers/setllements_controller.rb
	app/models/group.rb
	db/schema.rb
updated copy expense, still doesnt pre-fill form
getting up tod date
Merge branch 'master' into marcus
styled tables and updated column labels
Merge pull request #45 from elitenomad/marcus

Marcus
completed group settlements
Human readable numbers on amount
Merge branch 'master' into federico

manual conflicts solving
Conflicts:
	app/controllers/groups_controller.rb
	app/controllers/memberships_controller.rb
	app/controllers/settlements_controller.rb
	app/views/expenses/show.html.erb
	app/views/groups/show.html.erb
Merge pull request #46 from elitenomad/federico

Federico
Fixed the conflict