wersja do prezentacji
Merge branch 'master' of github.com:projects4PB/ziowebapp

Conflicts:
	templates/events/show.html
registration fix
places ratings v1
places ratings v1
Merge branch 'master' of heroku.com:zioprojekt
comments and ratings