sdsd
Merge branch 'master' into psuminski
oceny gwiazdki o.O
ACP fix
Merge branch 'psuminski'

Conflicts:
	app/views/restaurants/show.haml
poprawka
poprawka
Merge branch 'psuminski'
poprawione kontrolery
Merge branch 'psuminski'

Conflicts:
	app/controllers/restaurants_controller.rb
dezaktywacja i aktywacja
Merge branch 'master' of https://github.com/zarie/apka
dziala i push
asad
Merge branch 'master' of https://github.com/zarie/apka
Synchronizacja z pizzaportal.pl [z ui, bez bazy].
Merge branch 'master' into pablo
woah
Merge branch 'master' of github.com:zarie/apka

Conflicts:
	app/controllers/events_controller.rb
	app/controllers/restaurants_controller.rb
Merge branch 'master' of github.com:zarie/apka