Merge branch 'psuminski'

Conflicts:
	app/controllers/restaurants_controller.rb
asad
Merge branch 'master' of https://github.com/zarie/apka
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
woah
loosss
Import restauracji + poprawki w show dla nich.
Merge branch 'master' into pablo
beforki
Merge branch 'master' into mikolaj
Proba z innym gemem.
aktywna/nieaktywna
Merge branch 'master' of https://github.com/zarie/apka
css
testy
one error less
Merge branch 'master' of https://github.com/zarie/apka
merge