events & payments
Merge branch 'psuminski'
Merge branch 'master' of https://github.com/zarie/apka
Merge branch 'master' of https://github.com/zarie/apka into psuminski
Merge branch 'master' into psuminski
komentarz
poprawki
Merge branch 'master' of https://github.com/zarie/apka

Conflicts:
	db/schema.rb
schema
bills
Merge branch 'master' into kinga

Conflicts:
	app/controllers/dishes_contorller.rb
	app/models/dish.rb
	db/schema.rb
controllers
schema
Merge branch 'gapsa'
Merge branch 'volix'

Conflicts:
	app/controllers/invitations_controller.rb
	db/schema.rb
Invitations
poprawki 2
Merge branch 'master' of github.com:zarie/apka into kinga

Conflicts:
	db/schema.rb
schema
schema