restauracje bez jsa
Merge branch 'psuminski'

Conflicts:
	config/routes.rb
Merge branch 'master' of https://github.com/zarie/apka
Merge branch 'master' into pablo